Remove old PulseAudio handling code.
This commit is contained in:
Michael Jumper
parent
27d56df073
commit
daa7823aed
@ -1,155 +0,0 @@
|
||||
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is pa_handlers.
|
||||
*
|
||||
* The Initial Developers of the Original Code are
|
||||
* Craig Hokanson <craig.hokanson@sv.cmu.edu>
|
||||
* Sion Chaudhuri <sion.chaudhuri@sv.cmu.edu>
|
||||
* Gio Perez <gio.perez@sv.cmu.edu>
|
||||
* Portions created by the Initial Developer are Copyright (C) 2013
|
||||
* the Initial Developers. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include <errno.h>
|
||||
#include <time.h>
|
||||
|
||||
#include <guacamole/audio.h>
|
||||
#include <guacamole/client.h>
|
||||
|
||||
#include "client.h"
|
||||
|
||||
#include <pulse/simple.h>
|
||||
#include <pulse/error.h>
|
||||
#include <pulse/introspect.h>
|
||||
#include "pa_handlers.h"
|
||||
|
||||
void* guac_pa_read_audio(void* data) {
|
||||
|
||||
vnc_guac_client_data* client_data = (vnc_guac_client_data*) data;
|
||||
guac_client* client = client_data->audio->client;
|
||||
pa_simple* s_in;
|
||||
int error;
|
||||
pa_usec_t latency;
|
||||
unsigned char* buffer_data = malloc(sizeof(unsigned char) * BUF_DATA_SIZE);
|
||||
pa_sample_spec* sample_spec = malloc(sizeof(pa_sample_spec));
|
||||
|
||||
/* Create the sample spec for a record stream */
|
||||
sample_spec = malloc(sizeof(pa_sample_spec));
|
||||
sample_spec->format = PA_SAMPLE_S16LE;
|
||||
sample_spec->rate = SAMPLE_RATE;
|
||||
sample_spec->channels = CHANNELS;
|
||||
|
||||
guac_client_log_info(client, "Starting audio read thread...");
|
||||
|
||||
/* Create a new record stream */
|
||||
if (!(s_in = pa_simple_new(NULL, "Record from sound card", PA_STREAM_RECORD, NULL, "record", sample_spec, NULL, NULL, &error))) {
|
||||
guac_client_log_info(client, "Failed to create record stream using pa_simple_new(): %s\n", pa_strerror(error));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
while (client->state == GUAC_CLIENT_RUNNING) {
|
||||
|
||||
if ((latency = pa_simple_get_latency(s_in, &error)) == (pa_usec_t) -1) {
|
||||
guac_client_log_info(client, "Failed to get latency using pa_simple_get_latency(): %s\n", pa_strerror(error));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
if (pa_simple_read(s_in, buffer_data, sizeof(unsigned char) * BUF_DATA_SIZE, &error) < 0) {
|
||||
guac_client_log_info(client, "Failed to read audio buffer using pa_simple_read(): %s\n", pa_strerror(error));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
buffer_insert(audio_buffer, (void*) buffer_data);
|
||||
|
||||
}
|
||||
|
||||
finish:
|
||||
if (s_in)
|
||||
pa_simple_free(s_in);
|
||||
|
||||
free(buffer_data);
|
||||
free(sample_spec);
|
||||
buffer_close(audio_buffer);
|
||||
|
||||
guac_client_log_info(client, "Stopping audio read thread...");
|
||||
|
||||
return NULL;
|
||||
|
||||
}
|
||||
|
||||
void* guac_pa_send_audio(void* data) {
|
||||
|
||||
vnc_guac_client_data* client_data = (vnc_guac_client_data*) data;
|
||||
guac_audio_stream* audio = client_data->audio;
|
||||
guac_client* client = audio->client;
|
||||
unsigned char* buffer_data = malloc(sizeof(unsigned char) * BUF_DATA_SIZE);
|
||||
int counter;
|
||||
|
||||
guac_client_log_info(client, "Starting audio send thread...");
|
||||
|
||||
while (client->state == GUAC_CLIENT_RUNNING) {
|
||||
|
||||
guac_audio_stream_begin(audio, SAMPLE_RATE, CHANNELS, BPS);
|
||||
|
||||
counter = 0;
|
||||
while (counter < BUF_LENGTH) {
|
||||
|
||||
buffer_remove(audio_buffer, (void *) buffer_data);
|
||||
guac_audio_stream_write_pcm(audio, buffer_data, BUF_DATA_SIZE);
|
||||
counter++;
|
||||
|
||||
if (client->state != GUAC_CLIENT_RUNNING)
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
guac_audio_stream_end(audio);
|
||||
|
||||
guac_pa_sleep(SEND_INTERVAL);
|
||||
}
|
||||
|
||||
free(buffer_data);
|
||||
|
||||
guac_client_log_info(client, "Stopping audio send thread...");
|
||||
|
||||
return NULL;
|
||||
|
||||
}
|
||||
|
||||
void guac_pa_sleep(int millis) {
|
||||
|
||||
struct timespec sleep_period;
|
||||
|
||||
sleep_period.tv_sec = millis / 1000;
|
||||
sleep_period.tv_nsec = (millis % 1000) * 1000000L;
|
||||
|
||||
nanosleep(&sleep_period, NULL);
|
||||
|
||||
}
|
||||
@ -1,99 +0,0 @@
|
||||
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is pa_handlers.
|
||||
*
|
||||
* The Initial Developers of the Original Code are
|
||||
* Craig Hokanson <craig.hokanson@sv.cmu.edu>
|
||||
* Sion Chaudhuri <sion.chaudhuri@sv.cmu.edu>
|
||||
* Gio Perez <gio.perez@sv.cmu.edu>
|
||||
* Portions created by the Initial Developer are Copyright (C) 2013
|
||||
* the Initial Developers. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifndef __GUAC_VNC_PA_HANDLERS_H
|
||||
#define __GUAC_VNC_PA_HANDLERS_H
|
||||
|
||||
#include <guacamole/audio.h>
|
||||
|
||||
/**
|
||||
* The size of each data element in the audio buffer.
|
||||
*/
|
||||
#define BUF_DATA_SIZE 1024
|
||||
|
||||
/**
|
||||
* The length of the audio buffer
|
||||
*/
|
||||
#define BUF_LENGTH 100
|
||||
|
||||
/**
|
||||
* The number of samples per second of PCM data sent to this stream.
|
||||
*/
|
||||
#define SAMPLE_RATE 44100
|
||||
|
||||
/**
|
||||
* The number of audio channels per sample of PCM data. Legal values are
|
||||
* 1 or 2.
|
||||
*/
|
||||
#define CHANNELS 2
|
||||
|
||||
/**
|
||||
* The number of bits per sample per channel for PCM data. Only 16 is supported.
|
||||
*/
|
||||
#define BPS 16
|
||||
|
||||
/**
|
||||
* Minimum interval between two audio send instructions
|
||||
*/
|
||||
#define SEND_INTERVAL 500
|
||||
|
||||
/**
|
||||
* Reads audio data from Pulse Audio and inserts it into the
|
||||
* audio buffer
|
||||
*
|
||||
* @param data arguments for the read audio thread
|
||||
*/
|
||||
void* guac_pa_read_audio(void* data);
|
||||
|
||||
/**
|
||||
* Gets audio data from the audio buffer and sends it to
|
||||
* guacamole
|
||||
*
|
||||
* @param data arguments for the send audio thread
|
||||
*/
|
||||
void* guac_pa_send_audio(void* data);
|
||||
|
||||
/**
|
||||
* Sleep for the given number of milliseconds.
|
||||
*
|
||||
* @param millis The number of milliseconds to sleep.
|
||||
*/
|
||||
void guac_pa_sleep(int millis);
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user