Remove unused B2G-only stream_type field from cubeb_stream_params. (#347)

3 files changed, 0 insertions, 39 deletions

diff --git a/test/test_latency.cpp b/test/test_latency.cpp
index d71a137..6af39d5 100644
--- a/test/test_latency.cpp
+++ b/test/test_latency.cpp
@@ -35,9 +35,6 @@ TEST(cubeb, latency)
     preferred_rate,
     max_channels,
     CUBEB_LAYOUT_UNDEFINED
-#if defined(__ANDROID__)
-    , CUBEB_STREAM_TYPE_MUSIC
-#endif
   };
   r = cubeb_get_min_latency(ctx, &params, &latency_frames);
   ASSERT_TRUE(r == CUBEB_OK || r == CUBEB_ERROR_NOT_SUPPORTED);
diff --git a/test/test_mixer.cpp b/test/test_mixer.cpp
index 447bf52..fc9efef 100644
--- a/test/test_mixer.cpp
+++ b/test/test_mixer.cpp
@@ -115,9 +115,6 @@ downmix_test(float const * data, cubeb_channel_layout in_layout, cubeb_channel_l
     STREAM_FREQUENCY,
     layout_infos[in_layout].channels,
     in_layout
-#if defined(__ANDROID__)
-    , CUBEB_STREAM_TYPE_MUSIC
-#endif
   };
 
   cubeb_stream_params out_params = {
@@ -128,9 +125,6 @@ downmix_test(float const * data, cubeb_channel_layout in_layout, cubeb_channel_l
     (out_layout == CUBEB_LAYOUT_UNDEFINED) ?
       layout_infos[in_layout].channels : layout_infos[out_layout].channels,
     out_layout
-#if defined(__ANDROID__)
-    , CUBEB_STREAM_TYPE_MUSIC
-#endif
    };
 
   if (!cubeb_should_downmix(&in_params, &out_params)) {
diff --git a/test/test_sanity.cpp b/test/test_sanity.cpp
index f7f4567..b630c43 100644
--- a/test/test_sanity.cpp
+++ b/test/test_sanity.cpp
@@ -125,9 +125,6 @@ TEST(cubeb, context_variables)
   params.format = STREAM_FORMAT;
   params.rate = STREAM_RATE;
   params.layout = STREAM_LAYOUT;
-#if defined(__ANDROID__)
-  params.stream_type = CUBEB_STREAM_TYPE_MUSIC;
-#endif
   r = cubeb_get_min_latency(ctx, &params, &value);
   ASSERT_TRUE(r == CUBEB_OK || r == CUBEB_ERROR_NOT_SUPPORTED);
   if (r == CUBEB_OK) {
@@ -163,9 +160,6 @@ TEST(cubeb, init_destroy_stream)
   params.rate = STREAM_RATE;
   params.channels = STREAM_CHANNELS;
   params.layout = STREAM_LAYOUT;
-#if defined(__ANDROID__)
-  params.stream_type = CUBEB_STREAM_TYPE_MUSIC;
-#endif
 
   r = cubeb_stream_init(ctx, &stream, "test", NULL, NULL, NULL, &params, STREAM_LATENCY,
                         test_data_callback, test_state_callback, &dummy);
@@ -192,9 +186,6 @@ TEST(cubeb, init_destroy_multiple_streams)
   params.rate = STREAM_RATE;
   params.channels = STREAM_CHANNELS;
   params.layout = STREAM_LAYOUT;
-#if defined(__ANDROID__)
-  params.stream_type = CUBEB_STREAM_TYPE_MUSIC;
-#endif
 
   for (i = 0; i < ARRAY_LENGTH(stream); ++i) {
     r = cubeb_stream_init(ctx, &stream[i], "test", NULL, NULL, NULL, &params, STREAM_LATENCY,
@@ -225,9 +216,6 @@ TEST(cubeb, configure_stream)
   params.rate = STREAM_RATE;
   params.channels = 2; // panning
   params.layout = CUBEB_LAYOUT_STEREO;
-#if defined(__ANDROID__)
-  params.stream_type = CUBEB_STREAM_TYPE_MUSIC;
-#endif
 
   r = cubeb_stream_init(ctx, &stream, "test", NULL, NULL, NULL, &params, STREAM_LATENCY,
                         test_data_callback, test_state_callback, &dummy);
@@ -259,9 +247,6 @@ TEST(cubeb, configure_stream_undefined_layout)
   params.rate = STREAM_RATE;
   params.channels = 2; // panning
   params.layout = CUBEB_LAYOUT_UNDEFINED;
-#if defined(__ANDROID__)
-  params.stream_type = CUBEB_STREAM_TYPE_MUSIC;
-#endif
 
   r = cubeb_stream_init(ctx, &stream, "test", NULL, NULL, NULL, &params, STREAM_LATENCY,
                         test_data_callback, test_state_callback, &dummy);
@@ -297,9 +282,6 @@ test_init_start_stop_destroy_multiple_streams(int early, int delay_ms)
   params.rate = STREAM_RATE;
   params.channels = STREAM_CHANNELS;
   params.layout = STREAM_LAYOUT;
-#if defined(__ANDROID__)
-  params.stream_type = CUBEB_STREAM_TYPE_MUSIC;
-#endif
 
   for (i = 0; i < ARRAY_LENGTH(stream); ++i) {
     r = cubeb_stream_init(ctx, &stream[i], "test", NULL, NULL, NULL, &params, STREAM_LATENCY,
@@ -384,9 +366,6 @@ TEST(cubeb, init_destroy_multiple_contexts_and_streams)
   params.rate = STREAM_RATE;
   params.channels = STREAM_CHANNELS;
   params.layout = STREAM_LAYOUT;
-#if defined(__ANDROID__)
-  params.stream_type = CUBEB_STREAM_TYPE_MUSIC;
-#endif
 
   for (i = 0; i < ARRAY_LENGTH(ctx); ++i) {
     r = common_init(&ctx[i], "test_sanity");
@@ -425,9 +404,6 @@ TEST(cubeb, basic_stream_operations)
   params.rate = STREAM_RATE;
   params.channels = STREAM_CHANNELS;
   params.layout = STREAM_LAYOUT;
-#if defined(__ANDROID__)
-  params.stream_type = CUBEB_STREAM_TYPE_MUSIC;
-#endif
 
   r = cubeb_stream_init(ctx, &stream, "test", NULL, NULL, NULL, &params, STREAM_LATENCY,
                         test_data_callback, test_state_callback, &dummy);
@@ -476,9 +452,6 @@ TEST(cubeb, stream_position)
   params.rate = STREAM_RATE;
   params.channels = STREAM_CHANNELS;
   params.layout = STREAM_LAYOUT;
-#if defined(__ANDROID__)
-  params.stream_type = CUBEB_STREAM_TYPE_MUSIC;
-#endif
 
   r = cubeb_stream_init(ctx, &stream, "test", NULL, NULL, NULL, &params, STREAM_LATENCY,
                         test_data_callback, test_state_callback, &dummy);
@@ -612,9 +585,6 @@ TEST(cubeb, drain)
   params.rate = STREAM_RATE;
   params.channels = STREAM_CHANNELS;
   params.layout = STREAM_LAYOUT;
-#if defined(__ANDROID__)
-  params.stream_type = CUBEB_STREAM_TYPE_MUSIC;
-#endif
 
   r = cubeb_stream_init(ctx, &stream, "test", NULL, NULL, NULL, &params, STREAM_LATENCY,
                         test_drain_data_callback, test_drain_state_callback, &dummy);