annotate src/audlegacy/ui_new.c @ 4838:53dd85fdf42b

"default" -> "newui".
author William Pitcock <nenolod@atheme.org>
date Sun, 05 Apr 2009 15:28:31 -0500
parents 7bf7f83a217e
children a4dd5fcc46ce
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
1 /* Audacious - Cross-platform multimedia player
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
2 * Copyright (C) 2005-2008 Audacious development team
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
3 *
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
4 * This program is free software; you can redistribute it and/or modify
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
6 * the Free Software Foundation; under version 3 of the License.
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
7 *
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
8 * This program is distributed in the hope that it will be useful,
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
11 * GNU General Public License for more details.
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
12 *
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
13 * You should have received a copy of the GNU General Public License
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
14 * along with this program. If not, see <http://www.gnu.org/licenses>.
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
15 *
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
16 * The Audacious team does not consider modular code linking to
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
17 * Audacious or using our public API to be a derived work.
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
18 */
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
19
4667
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
20 #include <glib/gi18n.h>
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
21 #include <gtk/gtk.h>
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
22
4667
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
23 #include "interface.h"
4680
8becf76f2906 add pbutton_add and button_play; display only button image
Tomasz Mon <desowin@gmail.com>
parents: 4674
diff changeset
24 #include "playback.h"
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
25 #include "playlist.h"
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
26 #include "ui_fileopener.h"
4667
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
27 #include "ui_new.h"
4728
ab79ddbdcf42 introduce new playlist widget
Tomasz Mon <desowin@gmail.com>
parents: 4715
diff changeset
28 #include "ui_playlist_widget.h"
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
29
4733
5c9160f0ff1c Make the default UI suck less by killing the utterly pointless and redundant info bar.
William Pitcock <nenolod@atheme.org>
parents: 4732
diff changeset
30 static GtkWidget *label_time;
4682
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
31 static GtkWidget *slider;
4728
ab79ddbdcf42 introduce new playlist widget
Tomasz Mon <desowin@gmail.com>
parents: 4715
diff changeset
32 static GtkWidget *treeview;
4682
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
33
4687
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
34 static gulong slider_change_handler_id;
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
35 static gboolean slider_is_moving = FALSE;
4682
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
36 static gint update_song_timeout_source = 0;
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
37
4674
b71d4f3f3afd make some functions static
mf0102 <0102@gmx.at>
parents: 4667
diff changeset
38 static gboolean
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
39 window_delete()
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
40 {
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
41 return FALSE;
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
42 }
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
43
4674
b71d4f3f3afd make some functions static
mf0102 <0102@gmx.at>
parents: 4667
diff changeset
44 static void
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
45 window_destroy(GtkWidget *widget, gpointer data)
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
46 {
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
47 gtk_main_quit();
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
48 }
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
49
4674
b71d4f3f3afd make some functions static
mf0102 <0102@gmx.at>
parents: 4667
diff changeset
50 static void
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
51 button_open_pressed()
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
52 {
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
53 run_filebrowser(TRUE);
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
54 }
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
55
4674
b71d4f3f3afd make some functions static
mf0102 <0102@gmx.at>
parents: 4667
diff changeset
56 static void
4680
8becf76f2906 add pbutton_add and button_play; display only button image
Tomasz Mon <desowin@gmail.com>
parents: 4674
diff changeset
57 button_add_pressed()
8becf76f2906 add pbutton_add and button_play; display only button image
Tomasz Mon <desowin@gmail.com>
parents: 4674
diff changeset
58 {
8becf76f2906 add pbutton_add and button_play; display only button image
Tomasz Mon <desowin@gmail.com>
parents: 4674
diff changeset
59 run_filebrowser(FALSE);
8becf76f2906 add pbutton_add and button_play; display only button image
Tomasz Mon <desowin@gmail.com>
parents: 4674
diff changeset
60 }
8becf76f2906 add pbutton_add and button_play; display only button image
Tomasz Mon <desowin@gmail.com>
parents: 4674
diff changeset
61
8becf76f2906 add pbutton_add and button_play; display only button image
Tomasz Mon <desowin@gmail.com>
parents: 4674
diff changeset
62 static void
8becf76f2906 add pbutton_add and button_play; display only button image
Tomasz Mon <desowin@gmail.com>
parents: 4674
diff changeset
63 button_play_pressed()
8becf76f2906 add pbutton_add and button_play; display only button image
Tomasz Mon <desowin@gmail.com>
parents: 4674
diff changeset
64 {
8becf76f2906 add pbutton_add and button_play; display only button image
Tomasz Mon <desowin@gmail.com>
parents: 4674
diff changeset
65 if (playlist_get_length(playlist_get_active()))
8becf76f2906 add pbutton_add and button_play; display only button image
Tomasz Mon <desowin@gmail.com>
parents: 4674
diff changeset
66 playback_initiate();
8becf76f2906 add pbutton_add and button_play; display only button image
Tomasz Mon <desowin@gmail.com>
parents: 4674
diff changeset
67 else
8becf76f2906 add pbutton_add and button_play; display only button image
Tomasz Mon <desowin@gmail.com>
parents: 4674
diff changeset
68 button_open_pressed();
8becf76f2906 add pbutton_add and button_play; display only button image
Tomasz Mon <desowin@gmail.com>
parents: 4674
diff changeset
69 }
8becf76f2906 add pbutton_add and button_play; display only button image
Tomasz Mon <desowin@gmail.com>
parents: 4674
diff changeset
70
8becf76f2906 add pbutton_add and button_play; display only button image
Tomasz Mon <desowin@gmail.com>
parents: 4674
diff changeset
71 static void
4685
06028c2c9068 make a "pause" button and increase default window size
mf0102 <0102@gmx.at>
parents: 4684
diff changeset
72 button_pause_pressed()
06028c2c9068 make a "pause" button and increase default window size
mf0102 <0102@gmx.at>
parents: 4684
diff changeset
73 {
06028c2c9068 make a "pause" button and increase default window size
mf0102 <0102@gmx.at>
parents: 4684
diff changeset
74 playback_pause();
06028c2c9068 make a "pause" button and increase default window size
mf0102 <0102@gmx.at>
parents: 4684
diff changeset
75 }
06028c2c9068 make a "pause" button and increase default window size
mf0102 <0102@gmx.at>
parents: 4684
diff changeset
76
06028c2c9068 make a "pause" button and increase default window size
mf0102 <0102@gmx.at>
parents: 4684
diff changeset
77 static void
4715
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
78 button_stop_pressed()
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
79 {
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
80 playback_stop();
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
81 }
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
82
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
83 static void
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
84 button_previous_pressed()
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
85 {
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
86 playlist_prev(playlist_get_active());
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
87 }
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
88
4674
b71d4f3f3afd make some functions static
mf0102 <0102@gmx.at>
parents: 4667
diff changeset
89 static void
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
90 button_next_pressed()
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
91 {
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
92 playlist_next(playlist_get_active());
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
93 }
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
94
4674
b71d4f3f3afd make some functions static
mf0102 <0102@gmx.at>
parents: 4667
diff changeset
95 static void
4698
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
96 ui_set_song_info(gchar *text, gpointer user_data)
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
97 {
4698
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
98 gint length = playback_get_length();
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
99
4743
df6cd6f44a4f block value-changed signal handler before setting new range on position slider
Tomasz Mon <desowin@gmail.com>
parents: 4734
diff changeset
100 /* block "value-changed" signal handler to prevent skipping track
df6cd6f44a4f block value-changed signal handler before setting new range on position slider
Tomasz Mon <desowin@gmail.com>
parents: 4734
diff changeset
101 if the next track is shorter than the previous one --desowin */
df6cd6f44a4f block value-changed signal handler before setting new range on position slider
Tomasz Mon <desowin@gmail.com>
parents: 4734
diff changeset
102 g_signal_handler_block(slider, slider_change_handler_id);
4698
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
103 gtk_range_set_range(GTK_RANGE(slider), 0.0, (gdouble)length);
4743
df6cd6f44a4f block value-changed signal handler before setting new range on position slider
Tomasz Mon <desowin@gmail.com>
parents: 4734
diff changeset
104 g_signal_handler_unblock(slider, slider_change_handler_id);
df6cd6f44a4f block value-changed signal handler before setting new range on position slider
Tomasz Mon <desowin@gmail.com>
parents: 4734
diff changeset
105
4715
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
106 gtk_widget_show(label_time);
4696
851b12bf90d2 Properly escape all appropriate entities.
William Pitcock <nenolod@atheme.org>
parents: 4695
diff changeset
107
4728
ab79ddbdcf42 introduce new playlist widget
Tomasz Mon <desowin@gmail.com>
parents: 4715
diff changeset
108 ui_playlist_widget_set_current(treeview, playlist_get_position(playlist_get_active()));
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
109 }
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
110
4688
b3e2ea3f9297 display what would be played if user presses play button
Tomasz Mon <desowin@gmail.com>
parents: 4687
diff changeset
111 static void
b3e2ea3f9297 display what would be played if user presses play button
Tomasz Mon <desowin@gmail.com>
parents: 4687
diff changeset
112 ui_playlist_update(Playlist *playlist, gpointer user_data)
b3e2ea3f9297 display what would be played if user presses play button
Tomasz Mon <desowin@gmail.com>
parents: 4687
diff changeset
113 {
b3e2ea3f9297 display what would be played if user presses play button
Tomasz Mon <desowin@gmail.com>
parents: 4687
diff changeset
114 gchar *text = playlist_get_info_text(playlist);
4698
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
115 ui_set_song_info(text, NULL);
4688
b3e2ea3f9297 display what would be played if user presses play button
Tomasz Mon <desowin@gmail.com>
parents: 4687
diff changeset
116 g_free(text);
4728
ab79ddbdcf42 introduce new playlist widget
Tomasz Mon <desowin@gmail.com>
parents: 4715
diff changeset
117
ab79ddbdcf42 introduce new playlist widget
Tomasz Mon <desowin@gmail.com>
parents: 4715
diff changeset
118 ui_playlist_widget_update(treeview);
4688
b3e2ea3f9297 display what would be played if user presses play button
Tomasz Mon <desowin@gmail.com>
parents: 4687
diff changeset
119 }
b3e2ea3f9297 display what would be played if user presses play button
Tomasz Mon <desowin@gmail.com>
parents: 4687
diff changeset
120
4698
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
121 static void
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
122 ui_update_time_info(gint time)
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
123 {
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
124 gchar text[128];
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
125 gint length = playback_get_length();
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
126
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
127 time /= 1000;
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
128 length /= 1000;
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
129
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
130 g_snprintf(text, sizeof(text)/sizeof(gchar),
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
131 "<tt><b>%d:%.2d/%d:%.2d</b></tt>",
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
132 time / 60, time % 60,
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
133 length / 60, length % 60);
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
134 gtk_label_set_markup(GTK_LABEL(label_time), text);
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
135 }
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
136
4682
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
137 static gboolean
4688
b3e2ea3f9297 display what would be played if user presses play button
Tomasz Mon <desowin@gmail.com>
parents: 4687
diff changeset
138 ui_update_song_info(gpointer hook_data, gpointer user_data)
4682
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
139 {
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
140 if (!playback_get_playing())
4686
a6d1b4056966 reset slider when at end of song
mf0102 <0102@gmx.at>
parents: 4685
diff changeset
141 {
4743
df6cd6f44a4f block value-changed signal handler before setting new range on position slider
Tomasz Mon <desowin@gmail.com>
parents: 4734
diff changeset
142 gtk_range_set_value(GTK_RANGE(slider), 0.0);
4682
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
143 return FALSE;
4686
a6d1b4056966 reset slider when at end of song
mf0102 <0102@gmx.at>
parents: 4685
diff changeset
144 }
4682
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
145
4687
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
146 if (slider_is_moving)
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
147 return TRUE;
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
148
4682
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
149 gint time = playback_get_time();
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
150
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
151 g_signal_handler_block(slider, slider_change_handler_id);
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
152 gtk_range_set_value(GTK_RANGE(slider), (gdouble)time);
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
153 g_signal_handler_unblock(slider, slider_change_handler_id);
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
154
4698
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
155 ui_update_time_info(time);
4694
f0cc355c4660 Update time.
William Pitcock <nenolod@atheme.org>
parents: 4689
diff changeset
156
4682
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
157 return TRUE;
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
158 }
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
159
4715
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
160 static void
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
161 ui_clear_song_info()
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
162 {
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
163 gtk_widget_hide(label_time);
4734
0b96e6982c64 reset slider when we stop the song
mf0102 <0102@gmx.at>
parents: 4733
diff changeset
164 gtk_range_set_value(GTK_RANGE(slider), 0);
4715
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
165 }
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
166
4682
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
167 static gboolean
4687
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
168 ui_slider_value_changed_cb(GtkRange *range, gpointer user_data)
4682
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
169 {
4730
f9b49a8913b7 minimal interface: improve sanity for playback_seek() to make seek times more accurate.
William Pitcock <nenolod@atheme.org>
parents: 4728
diff changeset
170 gint seek_;
f9b49a8913b7 minimal interface: improve sanity for playback_seek() to make seek times more accurate.
William Pitcock <nenolod@atheme.org>
parents: 4728
diff changeset
171
f9b49a8913b7 minimal interface: improve sanity for playback_seek() to make seek times more accurate.
William Pitcock <nenolod@atheme.org>
parents: 4728
diff changeset
172 seek_ = gtk_range_get_value(range) / 1000;
f9b49a8913b7 minimal interface: improve sanity for playback_seek() to make seek times more accurate.
William Pitcock <nenolod@atheme.org>
parents: 4728
diff changeset
173
f9b49a8913b7 minimal interface: improve sanity for playback_seek() to make seek times more accurate.
William Pitcock <nenolod@atheme.org>
parents: 4728
diff changeset
174 /* XXX: work around a horrible bug in playback_seek(), also
f9b49a8913b7 minimal interface: improve sanity for playback_seek() to make seek times more accurate.
William Pitcock <nenolod@atheme.org>
parents: 4728
diff changeset
175 we should do mseek here. --nenolod */
f9b49a8913b7 minimal interface: improve sanity for playback_seek() to make seek times more accurate.
William Pitcock <nenolod@atheme.org>
parents: 4728
diff changeset
176 playback_seek(seek_ != 0 ? seek_ : 1);
4682
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
177
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
178 return TRUE;
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
179 }
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
180
4687
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
181 static gboolean
4698
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
182 ui_slider_change_value_cb(GtkRange *range, GtkScrollType scroll)
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
183 {
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
184 ui_update_time_info(gtk_range_get_value(range));
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
185 return FALSE;
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
186 }
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
187
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
188 static gboolean
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
189 ui_slider_button_press_cb(GtkWidget *widget, GdkEventButton *event,
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
190 gpointer user_data)
4687
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
191 {
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
192 slider_is_moving = TRUE;
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
193 return FALSE;
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
194 }
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
195
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
196 static gboolean
4698
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
197 ui_slider_button_release_cb(GtkWidget *widget, GdkEventButton *event,
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
198 gpointer user_data)
4687
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
199 {
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
200 slider_is_moving = FALSE;
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
201 return FALSE;
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
202 }
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
203
4682
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
204 static void
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
205 ui_playback_begin(gpointer hook_data, gpointer user_data)
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
206 {
4688
b3e2ea3f9297 display what would be played if user presses play button
Tomasz Mon <desowin@gmail.com>
parents: 4687
diff changeset
207 ui_update_song_info(NULL, NULL);
4698
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
208
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
209 /* update song info 4 times a second */
4683
86e2ba287242 improve the position slider's behavior a bit and do some indentation
mf0102 <0102@gmx.at>
parents: 4682
diff changeset
210 update_song_timeout_source =
4698
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
211 g_timeout_add(250, (GSourceFunc) ui_update_song_info, NULL);
4682
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
212 }
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
213
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
214 static void
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
215 ui_playback_stop(gpointer hook_data, gpointer user_data)
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
216 {
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
217 if (update_song_timeout_source) {
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
218 g_source_remove(update_song_timeout_source);
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
219 update_song_timeout_source = 0;
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
220 }
4715
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
221
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
222 ui_clear_song_info();
4728
ab79ddbdcf42 introduce new playlist widget
Tomasz Mon <desowin@gmail.com>
parents: 4715
diff changeset
223 ui_playlist_widget_set_current(treeview, -1);
4682
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
224 }
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
225
4686
a6d1b4056966 reset slider when at end of song
mf0102 <0102@gmx.at>
parents: 4685
diff changeset
226 static void
a6d1b4056966 reset slider when at end of song
mf0102 <0102@gmx.at>
parents: 4685
diff changeset
227 ui_playback_end(gpointer hook_data, gpointer user_data)
a6d1b4056966 reset slider when at end of song
mf0102 <0102@gmx.at>
parents: 4685
diff changeset
228 {
4688
b3e2ea3f9297 display what would be played if user presses play button
Tomasz Mon <desowin@gmail.com>
parents: 4687
diff changeset
229 ui_update_song_info(NULL, NULL);
4686
a6d1b4056966 reset slider when at end of song
mf0102 <0102@gmx.at>
parents: 4685
diff changeset
230 }
a6d1b4056966 reset slider when at end of song
mf0102 <0102@gmx.at>
parents: 4685
diff changeset
231
4776
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
232 static GtkWidget *
4698
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
233 gtk_toolbar_button_add(GtkWidget *toolbar, void(*callback)(),
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
234 const gchar *stock_id)
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
235 {
4776
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
236 GtkWidget *button = gtk_button_new();
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
237 gtk_button_set_label(GTK_BUTTON(button), stock_id);
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
238 gtk_button_set_use_stock(GTK_BUTTON(button), TRUE);
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
239 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
240
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
241 /* remove label */
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
242 GtkBox *box = GTK_BOX(gtk_bin_get_child(GTK_BIN(gtk_bin_get_child(GTK_BIN(button)))));
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
243 GList *iter;
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
244 for (iter = box->children; iter; iter = g_list_next(iter)) {
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
245 GtkBoxChild *child = (GtkBoxChild *) iter->data;
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
246 if (GTK_IS_LABEL(child->widget)) {
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
247 gtk_label_set_text(GTK_LABEL(child->widget), NULL);
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
248 break;
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
249 }
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
250 }
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
251
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
252 gtk_box_pack_start(GTK_BOX(toolbar), button, TRUE, TRUE, 0);
4680
8becf76f2906 add pbutton_add and button_play; display only button image
Tomasz Mon <desowin@gmail.com>
parents: 4674
diff changeset
253 g_signal_connect(G_OBJECT(button), "clicked",
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
254 G_CALLBACK(callback), NULL);
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
255 return button;
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
256 }
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
257
4674
b71d4f3f3afd make some functions static
mf0102 <0102@gmx.at>
parents: 4667
diff changeset
258 static GtkWidget *
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
259 gtk_markup_label_new(const gchar *str)
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
260 {
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
261 GtkWidget *label = gtk_label_new(str);
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
262 g_object_set(G_OBJECT(label), "use-markup", TRUE, NULL);
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
263 return label;
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
264 }
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
265
4698
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
266 static void
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
267 ui_hooks_associate()
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
268 {
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
269 hook_associate("title change", (HookFunction) ui_set_song_info, NULL);
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
270 hook_associate("playback seek", (HookFunction) ui_update_song_info, NULL);
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
271 hook_associate("playback begin", (HookFunction) ui_playback_begin, NULL);
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
272 hook_associate("playback stop", (HookFunction) ui_playback_stop, NULL);
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
273 hook_associate("playback end", (HookFunction) ui_playback_end, NULL);
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
274 hook_associate("playlist update", (HookFunction) ui_playlist_update, NULL);
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
275 }
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
276
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
277 static void
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
278 ui_hooks_disassociate()
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
279 {
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
280 hook_dissociate("title change", (HookFunction) ui_set_song_info);
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
281 hook_dissociate("playback seek", (HookFunction) ui_update_song_info);
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
282 hook_dissociate("playback begin", (HookFunction) ui_playback_begin);
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
283 hook_dissociate("playback stop", (HookFunction) ui_playback_stop);
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
284 hook_dissociate("playback end", (HookFunction) ui_playback_end);
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
285 hook_dissociate("playlist update", (HookFunction) ui_playlist_update);
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
286 }
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
287
4667
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
288 static gboolean
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
289 _ui_initialize(void)
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
290 {
4697
3b4400ab7397 fixing a warning and doing some renaming, indentation etc.
mf0102 <0102@gmx.at>
parents: 4696
diff changeset
291 GtkWidget *window; /* the main window */
3b4400ab7397 fixing a warning and doing some renaming, indentation etc.
mf0102 <0102@gmx.at>
parents: 4696
diff changeset
292 GtkWidget *vbox; /* the main vertical box */
4776
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
293 GtkWidget *tophbox; /* box to contain toolbar and shbox */
4728
ab79ddbdcf42 introduce new playlist widget
Tomasz Mon <desowin@gmail.com>
parents: 4715
diff changeset
294 GtkWidget *scrollwin; /* widget to hold playlist widget */
4776
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
295 GtkWidget *buttonbox; /* contains buttons like "open", "next" */
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
296 GtkWidget *shbox; /* box for slider + time combo --nenolod */
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
297 GtkWidget *button_open, *button_add,
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
298 *button_play, *button_pause, *button_stop,
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
299 *button_previous, *button_next;
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
300
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
301 window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
4685
06028c2c9068 make a "pause" button and increase default window size
mf0102 <0102@gmx.at>
parents: 4684
diff changeset
302 gtk_window_set_default_size(GTK_WINDOW(window), 450, 150);
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
303 g_signal_connect(G_OBJECT(window), "delete_event",
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
304 G_CALLBACK(window_delete), NULL);
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
305 g_signal_connect(G_OBJECT(window), "destroy",
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
306 G_CALLBACK(window_destroy), NULL);
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
307
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
308
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
309 vbox = gtk_vbox_new(FALSE, 0);
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
310 gtk_container_add(GTK_CONTAINER(window), vbox);
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
311
4776
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
312 tophbox = gtk_hbox_new(FALSE, 0);
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
313 gtk_box_pack_start(GTK_BOX(vbox), tophbox, FALSE, TRUE, 0);
4732
65d67970fab7 Move the slider bar to the toolbar, but this is kinda ugly at the moment.
William Pitcock <nenolod@atheme.org>
parents: 4730
diff changeset
314
4776
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
315 buttonbox = gtk_hbox_new(FALSE, 0);
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
316 button_open = gtk_toolbar_button_add(buttonbox, button_open_pressed,
4683
86e2ba287242 improve the position slider's behavior a bit and do some indentation
mf0102 <0102@gmx.at>
parents: 4682
diff changeset
317 GTK_STOCK_OPEN);
4776
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
318 button_add = gtk_toolbar_button_add(buttonbox, button_add_pressed,
4683
86e2ba287242 improve the position slider's behavior a bit and do some indentation
mf0102 <0102@gmx.at>
parents: 4682
diff changeset
319 GTK_STOCK_ADD);
4776
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
320 button_play = gtk_toolbar_button_add(buttonbox, button_play_pressed,
4680
8becf76f2906 add pbutton_add and button_play; display only button image
Tomasz Mon <desowin@gmail.com>
parents: 4674
diff changeset
321 GTK_STOCK_MEDIA_PLAY);
4776
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
322 button_pause = gtk_toolbar_button_add(buttonbox, button_pause_pressed,
4685
06028c2c9068 make a "pause" button and increase default window size
mf0102 <0102@gmx.at>
parents: 4684
diff changeset
323 GTK_STOCK_MEDIA_PAUSE);
4776
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
324 button_stop = gtk_toolbar_button_add(buttonbox, button_stop_pressed,
4715
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
325 GTK_STOCK_MEDIA_STOP);
4776
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
326 button_previous = gtk_toolbar_button_add(buttonbox, button_previous_pressed,
4683
86e2ba287242 improve the position slider's behavior a bit and do some indentation
mf0102 <0102@gmx.at>
parents: 4682
diff changeset
327 GTK_STOCK_MEDIA_PREVIOUS);
4776
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
328 button_next = gtk_toolbar_button_add(buttonbox, button_next_pressed,
4683
86e2ba287242 improve the position slider's behavior a bit and do some indentation
mf0102 <0102@gmx.at>
parents: 4682
diff changeset
329 GTK_STOCK_MEDIA_NEXT);
4732
65d67970fab7 Move the slider bar to the toolbar, but this is kinda ugly at the moment.
William Pitcock <nenolod@atheme.org>
parents: 4730
diff changeset
330
4776
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
331 gtk_box_pack_start(GTK_BOX(tophbox), buttonbox, FALSE, FALSE, 0);
4732
65d67970fab7 Move the slider bar to the toolbar, but this is kinda ugly at the moment.
William Pitcock <nenolod@atheme.org>
parents: 4730
diff changeset
332
65d67970fab7 Move the slider bar to the toolbar, but this is kinda ugly at the moment.
William Pitcock <nenolod@atheme.org>
parents: 4730
diff changeset
333 shbox = gtk_hbox_new(FALSE, 0);
4776
3e188277c4ed UI prettification, parts by desowin - thanks!
mf0102 <0102@gmx.at>
parents: 4743
diff changeset
334 gtk_box_pack_start(GTK_BOX(tophbox), shbox, TRUE, TRUE, 0);
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
335
4732
65d67970fab7 Move the slider bar to the toolbar, but this is kinda ugly at the moment.
William Pitcock <nenolod@atheme.org>
parents: 4730
diff changeset
336 slider = gtk_hscale_new(NULL);
65d67970fab7 Move the slider bar to the toolbar, but this is kinda ugly at the moment.
William Pitcock <nenolod@atheme.org>
parents: 4730
diff changeset
337 gtk_scale_set_draw_value(GTK_SCALE(slider), FALSE);
65d67970fab7 Move the slider bar to the toolbar, but this is kinda ugly at the moment.
William Pitcock <nenolod@atheme.org>
parents: 4730
diff changeset
338 /* TODO: make this configureable */
65d67970fab7 Move the slider bar to the toolbar, but this is kinda ugly at the moment.
William Pitcock <nenolod@atheme.org>
parents: 4730
diff changeset
339 gtk_range_set_update_policy(GTK_RANGE(slider), GTK_UPDATE_DISCONTINUOUS);
65d67970fab7 Move the slider bar to the toolbar, but this is kinda ugly at the moment.
William Pitcock <nenolod@atheme.org>
parents: 4730
diff changeset
340 gtk_box_pack_start(GTK_BOX(shbox), slider, TRUE, TRUE, 0);
65d67970fab7 Move the slider bar to the toolbar, but this is kinda ugly at the moment.
William Pitcock <nenolod@atheme.org>
parents: 4730
diff changeset
341
65d67970fab7 Move the slider bar to the toolbar, but this is kinda ugly at the moment.
William Pitcock <nenolod@atheme.org>
parents: 4730
diff changeset
342 label_time = gtk_markup_label_new(NULL);
65d67970fab7 Move the slider bar to the toolbar, but this is kinda ugly at the moment.
William Pitcock <nenolod@atheme.org>
parents: 4730
diff changeset
343 gtk_box_pack_start(GTK_BOX(shbox), label_time, FALSE, FALSE, 0);
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
344
4728
ab79ddbdcf42 introduce new playlist widget
Tomasz Mon <desowin@gmail.com>
parents: 4715
diff changeset
345 treeview = ui_playlist_widget_new();
ab79ddbdcf42 introduce new playlist widget
Tomasz Mon <desowin@gmail.com>
parents: 4715
diff changeset
346 scrollwin = gtk_scrolled_window_new(NULL, NULL);
ab79ddbdcf42 introduce new playlist widget
Tomasz Mon <desowin@gmail.com>
parents: 4715
diff changeset
347 gtk_container_add(GTK_CONTAINER(scrollwin), treeview);
ab79ddbdcf42 introduce new playlist widget
Tomasz Mon <desowin@gmail.com>
parents: 4715
diff changeset
348 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin),
ab79ddbdcf42 introduce new playlist widget
Tomasz Mon <desowin@gmail.com>
parents: 4715
diff changeset
349 GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
ab79ddbdcf42 introduce new playlist widget
Tomasz Mon <desowin@gmail.com>
parents: 4715
diff changeset
350 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollwin),
ab79ddbdcf42 introduce new playlist widget
Tomasz Mon <desowin@gmail.com>
parents: 4715
diff changeset
351 GTK_SHADOW_IN);
ab79ddbdcf42 introduce new playlist widget
Tomasz Mon <desowin@gmail.com>
parents: 4715
diff changeset
352
ab79ddbdcf42 introduce new playlist widget
Tomasz Mon <desowin@gmail.com>
parents: 4715
diff changeset
353 gtk_box_pack_end(GTK_BOX(vbox), scrollwin, TRUE, TRUE, 0);
ab79ddbdcf42 introduce new playlist widget
Tomasz Mon <desowin@gmail.com>
parents: 4715
diff changeset
354
4698
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
355 ui_hooks_associate();
4682
f6ea8f18c241 add position slider
Tomasz Mon <desowin@gmail.com>
parents: 4681
diff changeset
356
4683
86e2ba287242 improve the position slider's behavior a bit and do some indentation
mf0102 <0102@gmx.at>
parents: 4682
diff changeset
357 slider_change_handler_id =
4687
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
358 g_signal_connect(slider, "value-changed",
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
359 G_CALLBACK(ui_slider_value_changed_cb), NULL);
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
360
4698
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
361 g_signal_connect(slider, "change-value",
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
362 G_CALLBACK(ui_slider_change_value_cb), NULL);
4687
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
363 g_signal_connect(slider, "button-press-event",
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
364 G_CALLBACK(ui_slider_button_press_cb), NULL);
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
365 g_signal_connect(slider, "button-release-event",
9e70ca57b5dd small adjustments to slider
Tomasz Mon <desowin@gmail.com>
parents: 4686
diff changeset
366 G_CALLBACK(ui_slider_button_release_cb), NULL);
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
367
4688
b3e2ea3f9297 display what would be played if user presses play button
Tomasz Mon <desowin@gmail.com>
parents: 4687
diff changeset
368 ui_playlist_update(playlist_get_active(), NULL);
b3e2ea3f9297 display what would be played if user presses play button
Tomasz Mon <desowin@gmail.com>
parents: 4687
diff changeset
369
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
370 gtk_widget_show_all(window);
4715
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
371
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
372 ui_clear_song_info();
08ec4e638c2d - make stop button
mf0102 <0102@gmx.at>
parents: 4698
diff changeset
373
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
374 gtk_main();
4667
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
375
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
376 return TRUE;
4664
46c02b5589c2 commited initial version of new UI, which can be tested via "audacious -H"
mf0102 <0102@gmx.at>
parents:
diff changeset
377 }
4667
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
378
4689
a5707f571100 dissociate hooks at _ui_finalize
Tomasz Mon <desowin@gmail.com>
parents: 4688
diff changeset
379 static gboolean
a5707f571100 dissociate hooks at _ui_finalize
Tomasz Mon <desowin@gmail.com>
parents: 4688
diff changeset
380 _ui_finalize(void)
a5707f571100 dissociate hooks at _ui_finalize
Tomasz Mon <desowin@gmail.com>
parents: 4688
diff changeset
381 {
4698
cfc8d1e0c78b - update time info during slider movement
mf0102 <0102@gmx.at>
parents: 4697
diff changeset
382 ui_hooks_disassociate();
4689
a5707f571100 dissociate hooks at _ui_finalize
Tomasz Mon <desowin@gmail.com>
parents: 4688
diff changeset
383 return TRUE;
a5707f571100 dissociate hooks at _ui_finalize
Tomasz Mon <desowin@gmail.com>
parents: 4688
diff changeset
384 }
a5707f571100 dissociate hooks at _ui_finalize
Tomasz Mon <desowin@gmail.com>
parents: 4688
diff changeset
385
4667
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
386 static Interface default_interface = {
4838
53dd85fdf42b "default" -> "newui".
William Pitcock <nenolod@atheme.org>
parents: 4811
diff changeset
387 .id = "newui",
53dd85fdf42b "default" -> "newui".
William Pitcock <nenolod@atheme.org>
parents: 4811
diff changeset
388 .desc = N_("New Interface"),
4667
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
389 .init = _ui_initialize,
4689
a5707f571100 dissociate hooks at _ui_finalize
Tomasz Mon <desowin@gmail.com>
parents: 4688
diff changeset
390 .fini = _ui_finalize,
4667
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
391 };
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
392
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
393 Interface *
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
394 ui_populate_default_interface(void)
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
395 {
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
396 interface_register(&default_interface);
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
397
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
398 return &default_interface;
2079f04c19e2 Use new Interface API.
William Pitcock <nenolod@atheme.org>
parents: 4664
diff changeset
399 }