Skip to content

Commit

Permalink
Port to GTK 3
Browse files Browse the repository at this point in the history
  • Loading branch information
@SKefalidis
SKefalidis committed May 7, 2022
1 parent 8b002b6 commit 4c4d7f1
Show file tree
Hide file tree
Showing 14 changed files with 149 additions and 147 deletions.
74 changes: 36 additions & 38 deletions alsamixer/gam-app.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* (gtk-alsamixer) An ALSA mixer for GTK
*
* Copyright (C) 2001-2005 Derrick J Houy <[email protected]>.
* Copyright (C) 2022 Sergios - Anestis Kefalidis <[email protected]>.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -22,8 +23,6 @@
#include <config.h>
#endif

#include <gtk/gtklabel.h>
#include <gtk/gtknotebook.h>
#include <glib/gi18n.h>

#include "gam-app.h"
Expand All @@ -37,12 +36,12 @@ struct _GamAppPrivate

static gboolean gam_app_delete (GtkWidget *widget,
gpointer user_data);
static void gam_app_destroy (GtkObject *object);
static void gam_app_destroy (GtkWidget *widget);
static GObject *gam_app_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_params);
static void gam_app_load_prefs (GamApp *gam_app);
static void gam_app_save_prefs (GamApp *gam_app);
//static void gam_app_load_prefs (GamApp *gam_app);
//static void gam_app_save_prefs (GamApp *gam_app);
static void gam_app_mixer_display_name_changed_cb (GamMixer *gam_mixer,
GamApp *gam_app);
static void gam_app_mixer_visibility_changed_cb (GamMixer *gam_mixer);
Expand All @@ -55,17 +54,17 @@ G_DEFINE_TYPE_WITH_CODE (GamApp , gam_app, GTK_TYPE_WINDOW,
static void
gam_app_class_init (GamAppClass *klass)
{
GObjectClass *gobject_class;
GtkObjectClass *object_class;
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;

gobject_class = G_OBJECT_CLASS (klass);
object_class = GTK_OBJECT_CLASS (klass);
widget_class = GTK_WIDGET_CLASS (klass);

parent_class = g_type_class_peek_parent (klass);

gobject_class->constructor = gam_app_constructor;

object_class->destroy = gam_app_destroy;
widget_class->destroy = gam_app_destroy;
}

static void
Expand All @@ -89,20 +88,20 @@ gam_app_delete (GtkWidget *widget, gpointer user_data)

gam_app = GAM_APP (widget);

gam_app_save_prefs (gam_app);
// gam_app_save_prefs (gam_app);

return FALSE;
}

static void
gam_app_destroy (GtkObject *object)
gam_app_destroy (GtkWidget *widget)
{
GamApp *gam_app;

g_return_if_fail (object != NULL);
g_return_if_fail (GAM_IS_APP (object));
g_return_if_fail (widget != NULL);
g_return_if_fail (GAM_IS_APP (widget));

gam_app = GAM_APP (object);
gam_app = GAM_APP (widget);

gtk_main_quit ();

Expand All @@ -127,6 +126,8 @@ gam_app_constructor (GType type,

gam_app = GAM_APP (object);

gtk_window_set_default_size (GTK_WINDOW (gam_app), 800, 400);

g_signal_connect (G_OBJECT (gam_app), "delete_event",
G_CALLBACK (gam_app_delete), NULL);

Expand Down Expand Up @@ -169,34 +170,31 @@ gam_app_constructor (GType type,

gtk_widget_show (gam_app->priv->notebook);

gam_app_load_prefs (gam_app);
// gam_app_load_prefs (gam_app);

return object;
}

static void
gam_app_load_prefs (GamApp *gam_app)
{
gint height = 0, width = 0;

g_return_if_fail (GAM_IS_APP (gam_app));

if ((height != 0) && (width != 0))
gtk_window_resize (GTK_WINDOW (gam_app), width, height);
else /* This is really pedantic, since it is very unlikely to ever happen */
gtk_window_set_default_size (GTK_WINDOW (gam_app), 800, 400);
}

static void
gam_app_save_prefs (GamApp *gam_app)
{
gint height, width;

g_return_if_fail (GAM_IS_APP (gam_app));

gdk_window_get_geometry (GDK_WINDOW (GTK_WIDGET (gam_app)->window), NULL, NULL, &width, &height, NULL);

}
//static void
//gam_app_load_prefs (GamApp *gam_app)
//{
// gint height = 0, width = 0;
//
// g_return_if_fail (GAM_IS_APP (gam_app));
//
// if ((height != 0) && (width != 0))
// gtk_window_resize (GTK_WINDOW (gam_app), width, height);
//}
//
//static void
//gam_app_save_prefs (GamApp *gam_app)
//{
// gint height, width;
//
// g_return_if_fail (GAM_IS_APP (gam_app));
//
// gdk_window_get_geometry (GDK_WINDOW (gam_app), NULL, NULL, &width, &height);
//}

static void
gam_app_mixer_display_name_changed_cb (GamMixer *gam_mixer, GamApp *gam_app)
Expand Down
3 changes: 2 additions & 1 deletion alsamixer/gam-app.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* (gtk-alsamixer) An ALSA mixer for GTK
*
* Copyright (C) 2001-2005 Derrick J Houy <[email protected]>.
* Copyright (C) 2022 Sergios - Anestis Kefalidis <[email protected]>.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -21,7 +22,7 @@
#ifndef __GAM_APP_H__
#define __GAM_APP_H__

#include <gtk/gtkwindow.h>
#include <gtk/gtk.h>

G_BEGIN_DECLS

Expand Down
36 changes: 13 additions & 23 deletions alsamixer/gam-main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* (gtk-alsamixer) An ALSA mixer for GTK
*
* Copyright (C) 2001-2005 Derrick J Houy <[email protected]>.
* Copyright (C) 2022 Sergios - Anestis Kefalidis <[email protected]>.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -31,35 +32,24 @@ int
main (int argc, char *argv[])
{
GtkWidget *app;
GError *error;
// GnomeProgram *prog;
GError *error;

#ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
#endif
/*
prog = gtk_program_init (PACKAGE, VERSION, LIBGTKUI_MODULE,
argc, argv,
GTK_PARAM_HUMAN_READABLE_NAME, _("GTK ALSA Mixer"),
GTK_PARAM_APP_DATADIR, PACKAGE_DATA_DIR,
NULL);
if (!prog)
return 1; */

if (!gtk_init_with_args (&argc, &argv,
"alsamixer",
NULL,
NULL,
&error))
{
g_printerr(_("%s\nRun '%s --help' to see a full list of available command line options.\n"),
_("Error: could not initialize graphical user interface and option add_price_quotes was not set."),
argv[0]);
return 1;
}
if (!gtk_init_with_args (&argc, &argv,
"alsamixer",
NULL,
NULL,
&error))
{
g_printerr(_("%s\nRun '%s --help' to see a full list of available command line options.\n"),
_("Error: could not initialize graphical user interface and option add_price_quotes was not set."),
argv[0]);
return 1;
}

app = gam_app_new ();

Expand Down
92 changes: 48 additions & 44 deletions alsamixer/gam-mixer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* (gtk-alsamixer) An ALSA mixer for GTK
*
* Copyright (C) 2001-2005 Derrick J Houy <[email protected]>.
* Copyright (C) 2022 Sergios - Anestis Kefalidis <[email protected]>.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -24,7 +25,6 @@

#include <math.h>
#include <glib/gi18n.h>
#include <gtk/gtkhseparator.h>

#include "gam-mixer.h"
#include "gam-slider-pan.h"
Expand Down Expand Up @@ -83,9 +83,9 @@ static void gam_mixer_get_property (GObject *object,
GParamSpec *pspec);
static void gam_mixer_construct_elements (GamMixer *gam_mixer);
static void gam_mixer_construct_sliders (GamMixer *gam_mixer);
static void gam_mixer_refresh (gpointer data,
gint source,
GdkInputCondition condition);
static gboolean gam_mixer_refresh (GIOChannel *source,
GIOCondition condition,
gpointer data);

static gpointer parent_class;
static guint signals[LAST_SIGNAL] = { 0 };
Expand All @@ -97,7 +97,7 @@ static void
gam_mixer_class_init (GamMixerClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GtkObjectClass *object_class = (GtkObjectClass*) klass;
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);

parent_class = g_type_class_peek_parent (klass);

Expand All @@ -108,7 +108,7 @@ gam_mixer_class_init (GamMixerClass *klass)

signals[DISPLAY_NAME_CHANGED] =
g_signal_new ("display_name_changed",
G_OBJECT_CLASS_TYPE (object_class),
G_OBJECT_CLASS_TYPE (widget_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GamMixerClass, display_name_changed),
NULL, NULL,
Expand All @@ -117,7 +117,7 @@ gam_mixer_class_init (GamMixerClass *klass)

signals[VISIBILITY_CHANGED] =
g_signal_new ("visibility_changed",
G_OBJECT_CLASS_TYPE (object_class),
G_OBJECT_CLASS_TYPE (widget_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GamMixerClass, visibility_changed),
NULL, NULL,
Expand All @@ -144,7 +144,8 @@ static void
gam_mixer_init (GamMixer *gam_mixer)
{
GtkWidget *separator, *scrolled_window = NULL;
GtkObject *hadjustment, *vadjustment;
GtkAdjustment *hadjustment;
GtkAdjustment *vadjustment;

g_return_if_fail (GAM_IS_MIXER (gam_mixer));

Expand All @@ -169,29 +170,23 @@ gam_mixer_init (GamMixer *gam_mixer)
hadjustment = gtk_adjustment_new (0, 0, 101, 5, 5, 5);
vadjustment = gtk_adjustment_new (0, 0, 101, 5, 5, 5);

scrolled_window = gtk_scrolled_window_new (GTK_ADJUSTMENT (hadjustment),
GTK_ADJUSTMENT (vadjustment));
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
gtk_widget_show (scrolled_window);
gtk_box_pack_start (GTK_BOX (gam_mixer),
scrolled_window, TRUE, TRUE, 0);

gam_mixer->priv->slider_box = gtk_hbox_new (TRUE, 0);
gtk_widget_show (gam_mixer->priv->slider_box);

gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window),
gam_mixer->priv->slider_box);

separator = gtk_hseparator_new ();
gtk_widget_show (separator);
gtk_box_pack_start (GTK_BOX (gam_mixer),
separator, FALSE, TRUE, 1);

gam_mixer->priv->toggle_box = gtk_hbox_new (TRUE, 0);
gtk_widget_show (gam_mixer->priv->toggle_box);
gtk_box_pack_start (GTK_BOX (gam_mixer),
gam_mixer->priv->toggle_box, FALSE, FALSE, 0);
/* sliders */
scrolled_window = gtk_scrolled_window_new (GTK_ADJUSTMENT (hadjustment), GTK_ADJUSTMENT (vadjustment));
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
gtk_box_pack_start (GTK_BOX (gam_mixer), scrolled_window, TRUE, TRUE, 0);

gam_mixer->priv->slider_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_add (GTK_CONTAINER (scrolled_window), gam_mixer->priv->slider_box);

/* separator */
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (gam_mixer), separator, FALSE, TRUE, 1);

/* toggles */
gam_mixer->priv->toggle_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start (GTK_BOX (gam_mixer), gam_mixer->priv->toggle_box, FALSE, FALSE, 0);

gtk_widget_show_all (GTK_WIDGET (gam_mixer));
}

static void
Expand All @@ -201,13 +196,12 @@ gam_mixer_finalize (GObject *object)
guint input_id;

for (input_id = 0; input_id < gam_mixer->priv->input_id_count; ++input_id)
gtk_input_remove (gam_mixer->priv->input_ids[input_id]);
g_source_remove (gam_mixer->priv->input_ids[input_id]);

g_free (gam_mixer->priv->card_id);
g_free (gam_mixer->priv->card_name);
g_free (gam_mixer->priv->mixer_name);
g_free (gam_mixer->priv->mixer_name_config);
g_free (gam_mixer->priv->input_ids);

gam_mixer->priv->handle = NULL;
gam_mixer->priv->app = NULL;
Expand Down Expand Up @@ -286,16 +280,22 @@ gam_mixer_constructor (GType type,
input_ids = g_new (guint, poll_count);

for (input_id = 0; input_id < poll_count; ++input_id) {
GdkInputCondition condition = 0;
GIOChannel *channel;
GIOCondition condition = 0;
const struct pollfd * const pollfd = &polls[input_id];
const gint source = pollfd->fd;
const short events = pollfd->events;

if (events & POLLIN) condition |= GDK_INPUT_READ;
if (events & POLLOUT) condition |= GDK_INPUT_WRITE;
if (events & POLLPRI) condition |= GDK_INPUT_EXCEPTION;

input_ids[input_id] = gtk_input_add_full (source, condition, gam_mixer_refresh, 0, gam_mixer, 0);
const short events = pollfd->events;

if (events & POLLIN)
condition |= G_IO_IN;
if (events & POLLOUT)
condition |= G_IO_OUT;
if (events & POLLPRI)
condition |= G_IO_PRI;

channel = g_io_channel_unix_new (pollfd->fd);
input_ids[input_id] = g_io_add_watch_full (channel, G_PRIORITY_HIGH, condition,
gam_mixer_refresh, gam_mixer,
NULL);
}

gam_mixer->priv->input_ids = input_ids;
Expand Down Expand Up @@ -501,12 +501,16 @@ gam_mixer_set_visible (GamMixer *gam_mixer, gboolean visible)
g_signal_emit (G_OBJECT (gam_mixer), signals[VISIBILITY_CHANGED], 0);
}

static void
gam_mixer_refresh (gpointer data, gint source, GdkInputCondition condition)
static gboolean
gam_mixer_refresh (GIOChannel *source,
GIOCondition condition,
gpointer data)
{
const GamMixer * const gam_mixer = GAM_MIXER (data);

snd_mixer_handle_events (gam_mixer->priv->handle);

return TRUE;
}

void
Expand Down
Loading

0 comments on commit 4c4d7f1

Please sign in to comment.