Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
f16bf674
Commit
f16bf674
authored
17 years ago
by
Guillaume Carmel-Archambault
Browse files
Options
Downloads
Patches
Plain Diff
GTK Audio settings GUI improvment
parent
c9fefe51
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
sflphone-gtk/src/configwindow.c
+29
-29
29 additions, 29 deletions
sflphone-gtk/src/configwindow.c
with
29 additions
and
29 deletions
sflphone-gtk/src/configwindow.c
+
29
−
29
View file @
f16bf674
...
@@ -124,7 +124,7 @@ config_window_fill_codec_list()
...
@@ -124,7 +124,7 @@ config_window_fill_codec_list()
COLUMN_CODEC_ACTIVE
,
c
->
is_active
,
// Active
COLUMN_CODEC_ACTIVE
,
c
->
is_active
,
// Active
COLUMN_CODEC_NAME
,
c
->
name
,
// Name
COLUMN_CODEC_NAME
,
c
->
name
,
// Name
COLUMN_CODEC_FREQUENCY
,
g_strdup_printf
(
"%d kHz"
,
c
->
sample_rate
/
1000
),
// Frequency (kHz)
COLUMN_CODEC_FREQUENCY
,
g_strdup_printf
(
"%d kHz"
,
c
->
sample_rate
/
1000
),
// Frequency (kHz)
COLUMN_CODEC_BITRATE
,
g_strdup_printf
(
"%.1f kbps"
,
c
->
_bitrate
),
// Bitrate (
?
)
COLUMN_CODEC_BITRATE
,
g_strdup_printf
(
"%.1f kbps"
,
c
->
_bitrate
),
// Bitrate (
kbps
)
COLUMN_CODEC_BANDWIDTH
,
g_strdup_printf
(
"%.1f kbps"
,
c
->
_bandwidth
),
// Bandwidth (kpbs)
COLUMN_CODEC_BANDWIDTH
,
g_strdup_printf
(
"%.1f kbps"
,
c
->
_bandwidth
),
// Bandwidth (kpbs)
-
1
);
-
1
);
}
}
...
@@ -257,7 +257,8 @@ select_codec(GtkTreeSelection *selection, GtkTreeModel *model)
...
@@ -257,7 +257,8 @@ select_codec(GtkTreeSelection *selection, GtkTreeModel *model)
}
}
/**
/**
* TOSEE not working
* Toggle active value of codec on click and update changes to the deamon
* and in configuration files
*/
*/
static
void
static
void
codec_active_toggled
(
GtkCellRendererToggle
*
renderer
,
gchar
*
path
,
gpointer
*
data
)
codec_active_toggled
(
GtkCellRendererToggle
*
renderer
,
gchar
*
path
,
gpointer
*
data
)
...
@@ -278,11 +279,9 @@ codec_active_toggled(GtkCellRendererToggle *renderer, gchar *path, gpointer *dat
...
@@ -278,11 +279,9 @@ codec_active_toggled(GtkCellRendererToggle *renderer, gchar *path, gpointer *dat
COLUMN_CODEC_ACTIVE
,
&
active
,
COLUMN_CODEC_ACTIVE
,
&
active
,
-
1
);
-
1
);
active
=
!
active
;
// Toggle active value
// Toggle active value
gtk_list_store_set
(
GTK_LIST_STORE
(
model
),
&
iter
,
gtk_list_store_set
(
GTK_LIST_STORE
(
model
),
&
iter
,
COLUMN_CODEC_ACTIVE
,
active
,
COLUMN_CODEC_ACTIVE
,
!
active
,
-
1
);
-
1
);
gtk_tree_path_free
(
treePath
);
gtk_tree_path_free
(
treePath
);
...
@@ -291,7 +290,8 @@ codec_active_toggled(GtkCellRendererToggle *renderer, gchar *path, gpointer *dat
...
@@ -291,7 +290,8 @@ codec_active_toggled(GtkCellRendererToggle *renderer, gchar *path, gpointer *dat
}
}
/**
/**
* Move codec in list depending on direction and selected codec
* Move codec in list depending on direction and selected codec and
* update changes in the deamon list and the configuration files
*/
*/
static
void
static
void
moveCodec
(
gboolean
moveUp
,
gpointer
data
)
moveCodec
(
gboolean
moveUp
,
gpointer
data
)
...
@@ -534,9 +534,6 @@ create_accounts_tab()
...
@@ -534,9 +534,6 @@ create_accounts_tab()
GtkTreeSelection
*
treeSelection
;
GtkTreeSelection
*
treeSelection
;
GtkWidget
*
label
;
GtkWidget
*
label
;
GValue
val
;
val
.
g_type
=
G_TYPE_POINTER
;
selectedAccount
=
NULL
;
selectedAccount
=
NULL
;
ret
=
gtk_vbox_new
(
FALSE
,
10
);
ret
=
gtk_vbox_new
(
FALSE
,
10
);
...
@@ -657,22 +654,23 @@ create_audio_tab ()
...
@@ -657,22 +654,23 @@ create_audio_tab ()
GtkCellRenderer
*
renderer
;
GtkCellRenderer
*
renderer
;
GtkTreeIter
iter
;
GtkTreeIter
iter
;
GtkWidget
*
codecTable
;
// Main widget
// Main widget
ret
=
gtk_vbox_new
(
FALSE
,
10
);
ret
=
gtk_vbox_new
(
FALSE
,
10
);
gtk_container_set_border_width
(
GTK_CONTAINER
(
ret
),
10
);
gtk_container_set_border_width
(
GTK_CONTAINER
(
ret
),
10
);
// Device section label
// Device section label
deviceLabel
=
gtk_label_new
(
"Devices"
);
deviceLabel
=
gtk_label_new
(
NULL
);
gtk_label_set_markup
(
GTK_LABEL
(
deviceLabel
),
"<b>Devices</b>"
);
gtk_label_set_line_wrap
(
GTK_LABEL
(
deviceLabel
),
TRUE
);
gtk_label_set_line_wrap
(
GTK_LABEL
(
deviceLabel
),
TRUE
);
gtk_misc_set_alignment
(
GTK_MISC
(
deviceLabel
),
0
,
0
.
5
);
gtk_misc_set_alignment
(
GTK_MISC
(
deviceLabel
),
0
,
0
.
5
);
gtk_label_set_justify
(
GTK_LABEL
(
deviceLabel
),
GTK_JUSTIFY_LEFT
);
gtk_label_set_justify
(
GTK_LABEL
(
deviceLabel
),
GTK_JUSTIFY_LEFT
);
gtk_box_pack_start
(
GTK_BOX
(
ret
),
deviceLabel
,
FALSE
,
FALSE
,
0
);
gtk_box_pack_start
(
GTK_BOX
(
ret
),
deviceLabel
,
FALSE
,
FALSE
,
0
);
gtk_widget_show
(
deviceLabel
);
// Main device widget
// Main device widget
deviceBox
=
gtk_hbox_new
(
FALSE
,
10
);
deviceBox
=
gtk_hbox_new
(
FALSE
,
10
);
gtk_box_pack_start
(
GTK_BOX
(
ret
),
deviceBox
,
FALSE
,
FALSE
,
0
);
gtk_box_pack_start
(
GTK_BOX
(
ret
),
deviceBox
,
FALSE
,
FALSE
,
0
);
gtk_widget_show
(
codecBox
);
// Main device widget
// Main device widget
deviceTable
=
gtk_table_new
(
4
,
3
,
FALSE
);
deviceTable
=
gtk_table_new
(
4
,
3
,
FALSE
);
...
@@ -683,7 +681,7 @@ create_audio_tab ()
...
@@ -683,7 +681,7 @@ create_audio_tab ()
// Device : Audio manager
// Device : Audio manager
// Create title label
// Create title label
titleLabel
=
gtk_label_new
(
"Audio manager
:
"
);
titleLabel
=
gtk_label_new
(
"Audio manager"
);
gtk_misc_set_alignment
(
GTK_MISC
(
titleLabel
),
0
,
0
.
5
);
gtk_misc_set_alignment
(
GTK_MISC
(
titleLabel
),
0
,
0
.
5
);
gtk_table_attach
(
GTK_TABLE
(
deviceTable
),
titleLabel
,
1
,
2
,
0
,
1
,
GTK_FILL
|
GTK_EXPAND
,
GTK_SHRINK
,
0
,
0
);
gtk_table_attach
(
GTK_TABLE
(
deviceTable
),
titleLabel
,
1
,
2
,
0
,
1
,
GTK_FILL
|
GTK_EXPAND
,
GTK_SHRINK
,
0
,
0
);
gtk_widget_show
(
titleLabel
);
gtk_widget_show
(
titleLabel
);
...
@@ -743,10 +741,12 @@ create_audio_tab ()
...
@@ -743,10 +741,12 @@ create_audio_tab ()
// Create detect button
// Create detect button
refreshButton
=
gtk_button_new_with_label
(
"Detect all"
);
refreshButton
=
gtk_button_new_with_label
(
"Detect all"
);
gtk_button_set_image
(
GTK_BUTTON
(
refreshButton
),
gtk_image_new_from_stock
(
GTK_STOCK_REFRESH
,
GTK_ICON_SIZE_BUTTON
));
gtk_table_attach
(
GTK_TABLE
(
deviceTable
),
refreshButton
,
3
,
4
,
0
,
3
,
GTK_EXPAND
,
GTK_EXPAND
,
0
,
0
);
gtk_table_attach
(
GTK_TABLE
(
deviceTable
),
refreshButton
,
3
,
4
,
0
,
3
,
GTK_EXPAND
,
GTK_EXPAND
,
0
,
0
);
// Codec section label
// Codec section label
codecLabel
=
gtk_label_new
(
"Codecs"
);
codecLabel
=
gtk_label_new
(
NULL
);
gtk_label_set_markup
(
GTK_LABEL
(
codecLabel
),
"<b>Codecs</b>"
);
gtk_label_set_line_wrap
(
GTK_LABEL
(
codecLabel
),
TRUE
);
gtk_label_set_line_wrap
(
GTK_LABEL
(
codecLabel
),
TRUE
);
gtk_misc_set_alignment
(
GTK_MISC
(
codecLabel
),
0
,
0
.
5
);
gtk_misc_set_alignment
(
GTK_MISC
(
codecLabel
),
0
,
0
.
5
);
gtk_label_set_justify
(
GTK_LABEL
(
codecLabel
),
GTK_JUSTIFY_LEFT
);
gtk_label_set_justify
(
GTK_LABEL
(
codecLabel
),
GTK_JUSTIFY_LEFT
);
...
@@ -759,8 +759,8 @@ create_audio_tab ()
...
@@ -759,8 +759,8 @@ create_audio_tab ()
gtk_widget_show
(
codecBox
);
gtk_widget_show
(
codecBox
);
// Codec : List
// Codec : List
GtkWidget
*
codecTable
;
codecTable
=
create_codec_table
();
codecTable
=
create_codec_table
();
gtk_widget_set_size_request
(
GTK_WIDGET
(
codecTable
),
-
1
,
150
);
gtk_box_pack_start
(
GTK_BOX
(
codecBox
),
codecTable
,
TRUE
,
TRUE
,
0
);
gtk_box_pack_start
(
GTK_BOX
(
codecBox
),
codecTable
,
TRUE
,
TRUE
,
0
);
gtk_widget_show
(
codecTable
);
gtk_widget_show
(
codecTable
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment