#include <libchimara/glk.h>
#ifdef GSTREAMER_SOUND
#include <gst/gst.h>
-#include <gst/controller/gstcontroller.h>
#endif
#include "magic.h"
#include "schannel.h"
#include "resource.h"
#include "event.h"
+#define VOLUME_TIMER_RESOLUTION 1.0 /* In milliseconds */
+
extern GPrivate *glk_data_key;
#ifdef GSTREAMER_SOUND
}
}
-static double
-volume_glk_to_gstreamer(glui32 volume_glk)
-{
- return CLAMP(((double)volume_glk / 0x10000), 0.0, 10.0);
-}
-
-static void
-channel_set_volume_immediately(schanid_t chan, double volume, glui32 notify)
-{
- g_object_set(chan->filter, "volume", volume, NULL);
-
- if(notify != 0) {
- /* Send a notification */
- }
-}
-
/**
* glk_schannel_set_volume:
* @chan: Channel to set the volume of.
void
glk_schannel_set_volume(schanid_t chan, glui32 vol)
{
- VALID_SCHANNEL(chan, return);
- /* Silently ignore out-of-range volume values */
+ glk_schannel_set_volume_ext(chan, vol, 0, 0);
+}
+
+static double
+volume_glk_to_gstreamer(glui32 volume_glk)
+{
+ return CLAMP(((double)volume_glk / 0x10000), 0.0, 10.0);
+}
#ifdef GSTREAMER_SOUND
- double volume = volume_glk_to_gstreamer(vol);
- channel_set_volume_immediately(chan, volume, 0);
-#endif
+static gboolean
+volume_change_timeout(schanid_t chan)
+{
+ GTimeVal now;
+ g_get_current_time(&now);
+
+ if(now.tv_sec >= chan->target_time_sec && now.tv_usec >= chan->target_time_usec) {
+ /* We're done - make sure the volume is at the requested level */
+ g_object_set(chan->filter, "volume", chan->target_volume, NULL);
+
+ if(chan->volume_notify)
+ event_throw(chan->glk, evtype_VolumeNotify, NULL, 0, chan->volume_notify);
+
+ chan->volume_timer_id = 0;
+ return FALSE;
+ }
+
+ /* Calculate the appropriate step every time - a busy system may delay or
+ * drop timer ticks */
+ double time_left_msec = (chan->target_time_sec - now.tv_sec) * 1000.0
+ + (chan->target_time_usec - now.tv_usec) / 1000.0;
+ double steps_left = time_left_msec / VOLUME_TIMER_RESOLUTION;
+ double current_volume;
+ g_object_get(chan->filter, "volume", ¤t_volume, NULL);
+ double volume_step = (chan->target_volume - current_volume) / steps_left;
+
+ g_object_set(chan->filter, "volume", current_volume + volume_step, NULL);
+
+ return TRUE;
}
+#endif /* GSTREAMER_SOUND */
/**
* glk_schannel_set_volume_ext:
{
VALID_SCHANNEL(chan, return);
/* Silently ignore out-of-range volume values */
-
-#ifdef GSTREAMER_SOUND
- double volume = volume_glk_to_gstreamer(vol);
- /* TODO: If channel is not playing, change the volume anyway */
+#ifdef GSTREAMER_SOUND
+ /* Interrupt a previous volume change */
+ if(chan->volume_timer_id > 0)
+ g_source_remove(chan->volume_timer_id);
+
+ double target_volume = volume_glk_to_gstreamer(vol);
if(duration == 0) {
- channel_set_volume_immediately(chan, volume, notify);
- return;
- }
-
- /* Get the volume levels as GValues */
- GValue current_volume = { 0 };
- GValue target_volume = { 0 };
- g_value_init(¤t_volume, G_TYPE_DOUBLE);
- g_value_init(&target_volume, G_TYPE_DOUBLE);
- g_object_get_property(G_OBJECT(chan->filter), "volume", ¤t_volume);
- g_value_set_double(&target_volume, volume);
-
- /* Make a controller for the volume */
- GstController *controller = gst_object_control_properties(G_OBJECT(chan->filter), "volume", NULL);
- if(controller == NULL) {
- WARNING(_("Couldn't get controller for volume change"));
- goto fail;
- }
- GstInterpolationControlSource *csource = gst_interpolation_control_source_new();
- gst_interpolation_control_source_set_interpolation_mode(csource, GST_INTERPOLATE_LINEAR);
- if(!gst_controller_set_control_source(controller, "volume", GST_CONTROL_SOURCE(csource))) {
- WARNING(_("Couldn't set control source for volume change"));
- goto fail;
- }
+ g_object_set(chan->filter, "volume", target_volume, NULL);
- /* Get the current time on the pipeline */
- GstClock *clock = gst_pipeline_get_clock(GST_PIPELINE(chan->pipeline));
- GstClockTime current = gst_clock_get_time(clock);
- g_object_unref(clock);
+ if(notify != 0)
+ event_throw(chan->glk, evtype_VolumeNotify, NULL, 0, notify);
- if(!gst_interpolation_control_source_set(csource, current, ¤t_volume)) {
- WARNING(_("Couldn't program volume change"));
- goto fail;
- }
- if(!gst_interpolation_control_source_set(csource, current + duration * GST_MSECOND, &target_volume)) {
- WARNING(_("Couldn't program volume change"));
- goto fail;
+ return;
}
- /* TODO: SET UP NOTIFICATION */
+ GTimeVal target_time;
+ g_get_current_time(&target_time);
+ g_time_val_add(&target_time, (long)duration * 1000);
- return;
+ chan->target_volume = target_volume;
+ chan->target_time_sec = target_time.tv_sec;
+ chan->target_time_usec = target_time.tv_usec;
+ chan->volume_notify = notify;
-fail:
- /* Changing the volume dynamically didn't work; just do it immediately. */
- channel_set_volume_immediately(chan, volume, notify);
+ /* Set up a timer for the volume */
+ chan->volume_timer_id = g_timeout_add(VOLUME_TIMER_RESOLUTION, (GSourceFunc)volume_change_timeout, chan);
#endif
}