Commit ed67a5ef authored by Ole Aamot's avatar Ole Aamot

Prepare 0.1.3 release

parent 5b4a3667
commit 5b4a366755c38b10c0b157e497668689f7be4b75
Author: Ole Aamot <ole@gnome.org>
Date: Wed Jun 17 11:50:41 2020 +0200
Add gingerblue-studio-config.c
src/gingerblue-studio-config.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
commit 021d0c1b268ef9b327afe874016157c90e7ca4a1
Author: Ole Aamot <ole@gnome.org>
Date: Tue Jun 16 09:33:38 2020 +0200
Add gingerblue-main-loop.c
src/gingerblue-main-loop.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
commit bc5cd184630d70075c4efde5229187eb6bc369a0
Author: Ole Aamot <ole@gnome.org>
Date: Tue Jun 16 09:23:10 2020 +0200
Add gingerblue-app.c
Add gingerblue-config.c
src/gingerblue-app.c | 24 ++++++++++++++++++++++++
src/gingerblue-config.c | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+)
commit 69d837c8ed32b7ddbe356dbeca7d97f401236a41
Author: Ole Aamot <ole@gnome.org>
Date: Mon Sep 23 16:40:02 2019 +0200
Add gingerblue-record.c source in src/meson.build
src/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit d98b96e54fa1cc82d4d3fa428aaed4653c57195d
Author: Ole Aamot <ole@gnome.org>
Date: Tue Jan 29 04:49:32 2019 +0100
Prepare 0.1.2
NEWS | 1 +
TODO | 4 ++--
gingerblue.spec.in | 5 +++--
src/gingerblue.xml.in | 5 +++--
4 files changed, 9 insertions(+), 6 deletions(-)
commit 3754de784a02a2c47a21fd7949e54d66f2705bde
Author: Ole Aamot <ole@gnome.org>
Date: Tue Jan 29 04:41:29 2019 +0100
Rename application icons
data/icons/1024x1024/Makefile.am | 2 +-
.../apps/{gingerblue-gnome-gtk-gnu.png => gingerblue.png} | Bin
data/icons/16x16/Makefile.am | 2 +-
.../apps/{gingerblue-gnome-gtk-gnu.png => gingerblue.png} | Bin
data/icons/22x22/Makefile.am | 2 +-
.../apps/{gingerblue-gnome-gtk-gnu.png => gingerblue.png} | Bin
data/icons/24x24/Makefile.am | 2 +-
.../apps/{gingerblue-gnome-gtk-gnu.png => gingerblue.png} | Bin
data/icons/256x256/Makefile.am | 2 +-
.../apps/{gingerblue-gnome-gtk-gnu.png => gingerblue.png} | Bin
data/icons/32x32/Makefile.am | 2 +-
.../apps/{gingerblue-gnome-gtk-gnu.png => gingerblue.png} | Bin
data/icons/48x48/Makefile.am | 2 +-
.../apps/{gingerblue-gnome-gtk-gnu.png => gingerblue.png} | Bin
data/icons/512x512/Makefile.am | 2 +-
.../apps/{gingerblue-gnome-gtk-gnu.png => gingerblue.png} | Bin
16 files changed, 8 insertions(+), 8 deletions(-)
commit 0cdbfc75385a2b29f8de0042e274fb147b8fa45d
Merge: a1160fa 2ad0358
Author: Ole Aamot <ole@gnome.org>
Date: Tue Jan 29 04:29:01 2019 +0100
Merge branch 'master' of https://gitlab.gnome.org/ole/gingerblue
commit a1160fae87de747be66ea88b1c478a695aeb5991
Author: Ole Aamot <ole@gnome.org>
Date: Tue Jan 29 04:28:17 2019 +0100
Add icons
configure.ac | 9 +++++++++
data/Makefile.am | 2 ++
data/icons/1024x1024/Makefile.am | 7 +++++++
data/icons/1024x1024/apps/gingerblue-gnome-gtk-gnu.png | Bin 0 -> 134310 bytes
data/icons/16x16/Makefile.am | 7 +++++++
data/icons/16x16/apps/gingerblue-gnome-gtk-gnu.png | Bin 0 -> 898 bytes
data/icons/22x22/Makefile.am | 7 +++++++
data/icons/22x22/apps/gingerblue-gnome-gtk-gnu.png | Bin 0 -> 1222 bytes
data/icons/24x24/Makefile.am | 7 +++++++
data/icons/24x24/apps/gingerblue-gnome-gtk-gnu.png | Bin 0 -> 1350 bytes
data/icons/256x256/Makefile.am | 7 +++++++
data/icons/256x256/apps/gingerblue-gnome-gtk-gnu.png | Bin 0 -> 17683 bytes
data/icons/32x32/Makefile.am | 7 +++++++
data/icons/32x32/apps/gingerblue-gnome-gtk-gnu.png | Bin 0 -> 1519 bytes
data/icons/48x48/Makefile.am | 7 +++++++
data/icons/48x48/apps/gingerblue-gnome-gtk-gnu.png | Bin 0 -> 2486 bytes
data/icons/512x512/Makefile.am | 7 +++++++
data/icons/512x512/apps/gingerblue-gnome-gtk-gnu.png | Bin 0 -> 39187 bytes
data/icons/Makefile.am | 16 ++++++++++++++++
19 files changed, 83 insertions(+)
commit 2ad03580b2a3c622e064b927f55d62c82b28ead4
Author: Ole Aamot <ole@gnome.org>
Date: Sun Jan 27 16:01:22 2019 +0100
Update screenshot for 0.1
ChangeLog | 31 +++++++++++++++++++++++++++++++
data/screenshot.png | Bin 7792 -> 69604 bytes
2 files changed, 31 insertions(+)
commit e3100c31ec3fed8ca5ad7e0b1d2e4ebc21c76642
Author: Ole Aamot <ole@gnome.org>
Date: Sun Jan 27 15:55:10 2019 +0100
......
AC_PREREQ([2.69])
AC_INIT([gingerblue], [0.1.2], [ole@gnome.org])
AC_INIT([gingerblue], [0.1.3], [ole@gnome.org])
AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar subdir-objects])
AM_MAINTAINER_MODE
AC_CONFIG_SRCDIR([src/gingerblue-main.c])
......
......@@ -4,9 +4,9 @@ gingerbluedir = $(includedir)/gingerblue
gingerblue_DATA = gingerblue.xml
gingerblue_HEADERS = gingerblue.h gingerblue-chord.h gingerblue-file.h gingerblue-main.h gingerblue-knob.h gingerblue-line.h gingerblue-record.h gingerblue-song.h
gingerblue_HEADERS = gingerblue.h gingerblue-chord.h gingerblue-file.h gingerblue-main.h gingerblue-main-loop.h gingerblue-config.h gingerblue-knob.h gingerblue-line.h gingerblue-record.h gingerblue-song.h
gingerblue_SOURCES = gingerblue.c gingerblue-file.c gingerblue-main.c gingerblue-knob.c gingerblue-line.c gingerblue-record.c gingerblue-song.c
gingerblue_SOURCES = gingerblue.c gingerblue-app.c gingerblue-config.c gingerblue-file.c gingerblue-main.c gingerblue-main-loop.c gingerblue-knob.c gingerblue-line.c gingerblue-record.c gingerblue-song.c gingerblue-studio-config.c
gingerblue_CFLAGS = $(GINGERBLUE_CFLAGS)
......
......@@ -3,7 +3,7 @@
Copyright (C) 2020 Ole Aamot Software
Author(s): Ole Aamot <ole@gnome.org>
License: GNU GPL version 3
Version: 0.2.0 (2020-06-16)
Version: 0.1.3 (2020-06-20)
Website: http://www.gingerblue.org/
*/
......@@ -11,14 +11,16 @@
#include <gtk/gtk.h>
#include <gst/gst.h>
#include "gingerblue.h"
#include "gingerblue-main-loop.h"
int main (gint argc, gchar *argv[]) {
int main_app (gint argc, gchar *argv[]) {
GingerblueData *gingerblue_config;
GtkWindow *gingerblue_window;
gtk_init (&argc, &argv);
gingerblue_window = main_config ("LOCATIONS");
gingerblue_main_loop (gingerblue_window);
gingerblue_config = main_config ("LOCATIONS");
gingerblue_window = gingerblue_main_loop (gingerblue_config);
gtk_widget_show_all (gingerblue_window);
gst_init(&argc, &argc);
gtk_main_loop();
gtk_main();
return (0);
}
#ifndef GINGERBLUE_APP_H
#define GINGERBLUE_APP_H 1
#endif /* GINGERBLUE_APP_H */
......@@ -3,7 +3,7 @@
Copyright (C) 2018 Ole Aamot Software
Author(s): Ole Aamot <ole@gnome.org>
License: GNU GPL version 3
Version: 0.1.1 (2018-12-31)
Version: 0.1.3 (2020-06-20)
Website: http://www.gingerblue.org/
*/
......
......@@ -3,12 +3,17 @@
Copyright (C) 2020 Ole Aamot Software
Author(s): Ole Aamot <ole@gnome.org>
License: GNU GPL version 3
Version: 0.2.0 (2020-06-16)
Version: 0.1.3 (2020-06-20)
Website: http://www.gingerblue.org/
*/
#include <gtk/gtk.h>
#include <gtk/gtkbox.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkcontainer.h>
#include <gtk/gtkwindow.h>
#include <gst/gst.h>
#include "gingerblue.h"
......@@ -17,19 +22,19 @@ GtkWidget *main_config (gchar *location_data) {
GtkButton *AddStudioButton;
GtkButton *NewStudioButton;
GtkVBox *Studio;
GtkList *Location;
GtkMisc *Location;
GtkContainer *Container;
GtkWindow *gingerblue;
gingerblue = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW(gingerblue), "Gingerblue Music Studio");
gtk_window_set_title (GTK_WINDOW (gingerblue), "Gingerblue Music Studio");
AddStudioButton = gtk_button_new_with_label("Add Studio");
NewStudioButton = gtk_button_new_with_label("New Studio");
Studio = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
Location = gtk_list_box_new ();
gtk_container_add (GTK_WINDOW(gingerblue), GTK_CONTAINER (Studio));
gtk_box_pack_start (GTK_BOX(Studio), GTK_BUTTON(AddStudioButton), TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX(Studio), GTK_LIST_BOX(Location), TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX(Studio), GTK_BUTTON(NewStudioButton), TRUE, TRUE, 0);
gtk_widget_show_all (GTK_WIDGET(gingerblue));
gtk_container_add (GTK_CONTAINER (gingerblue), GTK_BOX (Studio));
gtk_box_pack_start (GTK_BOX (Studio), GTK_BUTTON (AddStudioButton), TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (Studio), GTK_LIST_BOX (Location), TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (Studio), GTK_BUTTON (NewStudioButton), TRUE, TRUE, 0);
gtk_widget_show_all (GTK_WIDGET (gingerblue));
return (GtkWidget *) gingerblue;
}
#ifndef GINGERBLUE_CONFIG_H
#define GINGERBLUE_CONFIG_H 1
GtkWidget *main_config (gchar *location_data);
#endif /* GINGERBLUE_CONFIG_H */
......@@ -3,7 +3,7 @@
Copyright (C) 2018 Ole Aamot Software
Author(s): Ole Aamot <ole@gnome.org>
License: GNU GPL version 3
Version: 0.1.1 (2018-12-31)
Version: 0.1.3 (2020-06-20)
Website: http://www.gingerblue.org/
*/
......
......@@ -3,7 +3,7 @@
Copyright (C) 2018 Ole Aamot Software
Author(s): Ole Aamot <ole@gnome.org>
License: GNU GPL version 3
Version: 0.1.1 (2018-12-31)
Version: 0.1.3 (2020-06-20)
Website: http://www.gingerblue.org/
*/
......
......@@ -3,7 +3,7 @@
Copyright (C) 2018 Ole Aamot Software
Author(s): Ole Aamot <ole@gnome.org>
License: GNU GPL version 3
Version: 0.1.1 (2018-12-31)
Version: 0.1.3 (2020-06-20)
Website: http://www.gingerblue.org/
*/
......
......@@ -3,7 +3,7 @@
Copyright (C) 2020 Ole Aamot Software
Author(s): Ole Aamot <ole@gnome.org>
License: GNU GPL version 3
Version: 0.2.0 (2020-06-16)
Version: 0.1.3 (2020-06-20)
Website: http://www.gingerblue.org/
*/
......@@ -12,5 +12,7 @@
#include <gst/gst.h>
#include "gingerblue.h"
void gingerblue_main_loop (GingerblueData *Gingerblue) {
GtkWidget *gingerblue_main_loop (GingerblueData *gingerblue) {
GingerblueData *Gingerblue = gingerblue;
Gingerblue->window = main_studio_config ("LOCATIONS", "Oslo, Norway");
}
#ifndef GINGERBLUE_MAIN_LOOP_H
#define GINGERBLUE_MAIN_LOOP_H 1
GtkWidget *gingerblue_main_loop (GingerblueData *gingerblue);
#endif /* GINGERBLUE_MAIN_LOOP_H */
......@@ -87,6 +87,7 @@ int main (int argc, char **argv) {
GtkWidget *introduction;
GtkWidget *entry, *label, *button, *progress, *hbox;
GtkWidget *summary_label, *summary_entry;
GtkWidget *gingerblue_main;
guint i;
GtkWidget *musicianpage;
GtkWidget *songpage;
......@@ -95,6 +96,7 @@ int main (int argc, char **argv) {
GtkWidget *window;
GtkWidget *frame;
GtkWidget *input;
GtkWidget *main_window;
GtkWidget *mixer;
GtkWidget *control;
GtkWidget *soundboard;
......@@ -225,7 +227,10 @@ int main (int argc, char **argv) {
/* NULL); */
/* gtk_assistant_commit (introduction); */
gtk_widget_show_all (GTK_WIDGET (introduction));
/* FIXME Fix core dump
main_window = gingerblue_main_loop (data);
gtk_widget_show_all (main_window);
*/
gst_init (&argc, &argv);
/* player = play_new ("http://stream.radionorwegian.com/56.ogg", gingerblue_data->volume); */
/* input_volume_value = gb_window_set_volume(GTK_VOLUME_BUTTON (input_volume), 0.00); *\/ */
......
......@@ -3,7 +3,7 @@
Copyright (C) 2018 Ole Aamot Software
Author(s): Ole Aamot <ole@gnome.org>
License: GNU GPL version 3
Version: 0.1.1 (2018-12-31)
Version: 0.1.3 (2020-06-20)
Website: http://www.gingerblue.org/
*/
......
......@@ -3,7 +3,7 @@
Copyright (C) 2018 Ole Aamot Software
Author(s): Ole Aamot <ole@gnome.org>
License: GNU GPL version 3
Version: 0.1.1 (2018-12-31)
Version: 0.1.3 (2020-06-20)
Website: http://www.gingerblue.org/
*/
......
......@@ -3,7 +3,7 @@
Copyright (C) 2018 Ole Aamot Software
Author(s): Ole Aamot <ole@gnome.org>
License: GNU GPL version 3
Version: 0.1.1 (2018-12-31)
Version: 0.1.3 (2020-06-20)
Website: http://www.gingerblue.org/
*/
......
......@@ -3,7 +3,7 @@
Copyright (C) 2020 Ole Aamot Software
Author(s): Ole Aamot <ole@gnome.org>
License: GNU GPL version 3
Version: 0.2.0 (2020-06-16)
Version: 0.1.3 (2020-06-20)
Website: http://www.gingerblue.org/
*/
......@@ -15,15 +15,14 @@
GtkWidget *main_studio_config (gchar *location_data, gchar *studio_city) {
GingerblueData *Gingerblue;
GtkBox *Locations;
GtkList *Location;
GtkMisc *Location;
GtkContainer *Container;
Locations = gtk_box_new (GTK_BOX_VERTICAL);
Locations = gtk_box_new (ATK_STATE_VERTICAL, 1);
Location = gtk_list_box_new ();
gtk_container_add (GTK_CONTAINER (Container), GTK_BOX (Locations));
gtk_container_add (GTK_CONTAINER (Container), GTK_LIST_BOX (Location));;
gtk_box_pack_start (GTK_BOX(Studio), GTK_BUTTON(Locations), TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX(Studio), GTK_LIST_BOX(Location), TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX(Studio), GTK_CONTAINER(Container), TRUE, TRUE, 0);
gtk_widget_show_all (GTK_WIDGET(gingerblue));
return (GtkWidget *) gingerblue;
gtk_container_add (GTK_CONTAINER (Container), GTK_LIST_BOX (Location));
gtk_container_add (GTK_CONTAINER (Container), GTK_BOX(Locations));
gtk_container_add (GTK_CONTAINER (Container), GTK_LIST_BOX(Location));
gtk_widget_show_all (GTK_WIDGET (Container));
return (GtkWidget *) Gingerblue;
}
......@@ -3,7 +3,7 @@
Copyright (C) 2018 Ole Aamot Software
Author(s): Ole Aamot <ole@gnome.org>
License: GNU GPL version 3
Version: 0.1.1 (2018-12-31)
Version: 0.1.3 (2020-06-20)
Website: http://www.gingerblue.org/
*/
......@@ -26,6 +26,7 @@ struct _GingerblueData {
gchar *volume;
GingerblueData *next;
GingerblueData *prev;
GtkWidget *window;
};
void gb_window_break_record (GtkButton *record, GtkVolumeButton *volume);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment