gui/audio: Convert gst.cpp to audio.c
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
parent
c48e128d0a
commit
50a7c83d61
|
@ -1,18 +1,11 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2014 (c) Anna Schumaker.
|
* Copyright 2014 (c) Anna Schumaker.
|
||||||
*
|
|
||||||
* The gst_init() function parses command line options passed to Ocarina
|
|
||||||
* through argv. Use the command `gst-inspect-1.0 --help-gst` to find
|
|
||||||
* what options are supported.
|
|
||||||
*/
|
*/
|
||||||
extern "C" {
|
|
||||||
#include <core/audio.h>
|
#include <core/audio.h>
|
||||||
#include <core/playlist.h>
|
#include <core/playlist.h>
|
||||||
#include <core/string.h>
|
#include <core/string.h>
|
||||||
#include <gui/builder.h>
|
|
||||||
}
|
|
||||||
#include <gui/audio.h>
|
#include <gui/audio.h>
|
||||||
#include <gui/ocarina.h>
|
#include <gui/builder.h>
|
||||||
|
|
||||||
|
|
||||||
static GtkScale *o_seek;
|
static GtkScale *o_seek;
|
||||||
|
@ -84,7 +77,7 @@ struct audio_ops audio_ops = {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static bool on_seek(Gtk::ScrollType type, double value)
|
static bool on_seek(GtkScrollType type, double value)
|
||||||
{
|
{
|
||||||
audio_seek(value);
|
audio_seek(value);
|
||||||
return true;
|
return true;
|
|
@ -4,10 +4,10 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#include <core/core.h>
|
#include <core/core.h>
|
||||||
#include <core/idle.h>
|
#include <core/idle.h>
|
||||||
#include <gui/settings.h>
|
|
||||||
#include <gui/builder.h>
|
|
||||||
}
|
|
||||||
#include <gui/audio.h>
|
#include <gui/audio.h>
|
||||||
|
#include <gui/builder.h>
|
||||||
|
#include <gui/settings.h>
|
||||||
|
}
|
||||||
#include <gui/ocarina.h>
|
#include <gui/ocarina.h>
|
||||||
#include <gui/tabs.h>
|
#include <gui/tabs.h>
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2013 (c) Anna Schumaker.
|
* Copyright 2013 (c) Anna Schumaker.
|
||||||
|
*
|
||||||
|
* The gst_init() function parses command line options passed to Ocarina
|
||||||
|
* through argv. Use the command `gst-inspect-1.0 --help-gst` to find
|
||||||
|
* what options are supported.
|
||||||
*/
|
*/
|
||||||
#ifndef OCARINA_CORE_AUDIO_H
|
#ifndef OCARINA_CORE_AUDIO_H
|
||||||
#define OCARINA_CORE_AUDIO_H
|
#define OCARINA_CORE_AUDIO_H
|
||||||
|
|
|
@ -4,6 +4,9 @@
|
||||||
#ifndef OCARINA_GUI_AUDIO_H
|
#ifndef OCARINA_GUI_AUDIO_H
|
||||||
#define OCARINA_GUI_AUDIO_H
|
#define OCARINA_GUI_AUDIO_H
|
||||||
|
|
||||||
|
/* Audio callback functions. */
|
||||||
|
extern struct audio_ops audio_ops;
|
||||||
|
|
||||||
/* Called to initialize the GUI audio controls. */
|
/* Called to initialize the GUI audio controls. */
|
||||||
void gui_audio_init();
|
void gui_audio_init();
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,6 @@ extern struct queue_ops collection_ops;
|
||||||
extern struct queue_ops history_ops;
|
extern struct queue_ops history_ops;
|
||||||
extern struct queue_ops playlist_ops;
|
extern struct queue_ops playlist_ops;
|
||||||
extern struct queue_ops tempq_ops;
|
extern struct queue_ops tempq_ops;
|
||||||
extern struct audio_ops audio_ops;
|
|
||||||
|
|
||||||
void on_pq_created(queue *, unsigned int);
|
void on_pq_created(queue *, unsigned int);
|
||||||
void post_init_queue_tabs();
|
void post_init_queue_tabs();
|
||||||
|
|
Loading…
Reference in New Issue