Browse Source

(API Change) Rename source_audio structure

Rename source_audio to obs_source_audio to make it more consistent with
the rest of the API
jp9000 11 years ago
parent
commit
0961af6e66

+ 4 - 3
libobs/obs-source.c

@@ -1373,7 +1373,7 @@ static inline struct obs_audio_data *filter_async_audio(obs_source_t source,
 }
 
 static inline void reset_resampler(obs_source_t source,
-		const struct source_audio *audio)
+		const struct obs_source_audio *audio)
 {
 	const struct audio_output_info *obs_info;
 	struct resample_info output_info;
@@ -1430,7 +1430,8 @@ static inline void copy_audio_data(obs_source_t source,
 }
 
 /* resamples/remixes new audio to the designated main audio output format */
-static void process_audio(obs_source_t source, const struct source_audio *audio)
+static void process_audio(obs_source_t source,
+		const struct obs_source_audio *audio)
 {
 	if (source->sample_info.samples_per_sec != audio->samples_per_sec ||
 	    source->sample_info.format          != audio->format          ||
@@ -1460,7 +1461,7 @@ static void process_audio(obs_source_t source, const struct source_audio *audio)
 }
 
 void obs_source_output_audio(obs_source_t source,
-		const struct source_audio *audio)
+		const struct obs_source_audio *audio)
 {
 	uint32_t flags;
 	struct obs_audio_data *output;

+ 2 - 2
libobs/obs.h

@@ -162,7 +162,7 @@ struct obs_audio_data {
  * Source audio output structure.  Used with obs_source_output_audio to output
  * source audio.  Audio is automatically resampled and remixed as necessary.
  */
-struct source_audio {
+struct obs_source_audio {
 	const uint8_t       *data[MAX_AV_PLANES];
 	uint32_t            frames;
 
@@ -712,7 +712,7 @@ EXPORT void obs_source_output_video(obs_source_t source,
 
 /** Outputs audio data (always asynchronous) */
 EXPORT void obs_source_output_audio(obs_source_t source,
-		const struct source_audio *audio);
+		const struct obs_source_audio *audio);
 
 /** Gets the current async video frame */
 EXPORT struct obs_source_frame *obs_source_get_frame(obs_source_t source);

+ 1 - 1
plugins/linux-pulseaudio/pulse-input.c

@@ -117,7 +117,7 @@ static void pulse_stream_read(pa_stream *p, size_t nbytes, void *userdata)
 		goto exit;
 	}
 
-	struct source_audio out;
+	struct obs_source_audio out;
 	out.speakers        = data->speakers;
 	out.samples_per_sec = data->samples_per_sec;
 	out.format          = pulse_to_obs_audio_format(data->format);

+ 1 - 1
plugins/mac-capture/mac-audio.c

@@ -299,7 +299,7 @@ static OSStatus input_callback(
 {
 	struct coreaudio_data *ca = data;
 	OSStatus stat;
-	struct source_audio audio;
+	struct obs_source_audio audio;
 
 	stat = AudioUnitRender(ca->unit, action_flags, ts_data, bus_num, frames,
 			ca->buf_list);

+ 7 - 7
plugins/win-wasapi/win-wasapi.cpp

@@ -357,13 +357,13 @@ bool WASAPISource::ProcessCaptureData()
 			return false;
 		}
 
-		source_audio data    = {};
-		data.data[0]         = (const uint8_t*)buffer;
-		data.frames          = (uint32_t)frames;
-		data.speakers        = speakers;
-		data.samples_per_sec = sampleRate;
-		data.format          = format;
-		data.timestamp       = useDeviceTiming ?
+		obs_source_audio data = {};
+		data.data[0]          = (const uint8_t*)buffer;
+		data.frames           = (uint32_t)frames;
+		data.speakers         = speakers;
+		data.samples_per_sec  = sampleRate;
+		data.format           = format;
+		data.timestamp        = useDeviceTiming ?
 			ts*100 : os_gettime_ns();
 
 		obs_source_output_audio(source, &data);

+ 1 - 1
test/test-input/test-sinewave.c

@@ -41,7 +41,7 @@ static void *sinewave_thread(void *pdata)
 			bytes[i] = (uint8_t)((wave+1.0)*0.5 * 255.0);
 		}
 
-		struct source_audio data;
+		struct obs_source_audio data;
 		data.data[0] = bytes;
 		data.frames = 480;
 		data.speakers = SPEAKERS_MONO;