diff options
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio/pulseaudio/0004-card-remove-pa_card_new_data.active_profile.patch')
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio/0004-card-remove-pa_card_new_data.active_profile.patch | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0004-card-remove-pa_card_new_data.active_profile.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0004-card-remove-pa_card_new_data.active_profile.patch deleted file mode 100644 index 480f2cea41..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0004-card-remove-pa_card_new_data.active_profile.patch +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | From 375bc56fd3d66f40a9650224e5bfea4002494ade Mon Sep 17 00:00:00 2001 | ||
2 | From: Tanu Kaskinen <tanuk@iki.fi> | ||
3 | Date: Fri, 23 Oct 2015 13:50:35 +0300 | ||
4 | Subject: [PATCH 4/5] card: remove pa_card_new_data.active_profile | ||
5 | |||
6 | It's not being used any more. | ||
7 | |||
8 | Upstream-Status: Accepted [expected in 10.0] | ||
9 | |||
10 | Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> | ||
11 | --- | ||
12 | src/pulsecore/card.c | 8 -------- | ||
13 | src/pulsecore/card.h | 5 ----- | ||
14 | 2 files changed, 13 deletions(-) | ||
15 | |||
16 | diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c | ||
17 | index a0c3d93..bc5b75b 100644 | ||
18 | --- a/src/pulsecore/card.c | ||
19 | +++ b/src/pulsecore/card.c | ||
20 | @@ -96,13 +96,6 @@ void pa_card_new_data_set_name(pa_card_new_data *data, const char *name) { | ||
21 | data->name = pa_xstrdup(name); | ||
22 | } | ||
23 | |||
24 | -void pa_card_new_data_set_profile(pa_card_new_data *data, const char *profile) { | ||
25 | - pa_assert(data); | ||
26 | - | ||
27 | - pa_xfree(data->active_profile); | ||
28 | - data->active_profile = pa_xstrdup(profile); | ||
29 | -} | ||
30 | - | ||
31 | void pa_card_new_data_set_preferred_port(pa_card_new_data *data, pa_direction_t direction, pa_device_port *port) { | ||
32 | pa_assert(data); | ||
33 | |||
34 | @@ -125,7 +118,6 @@ void pa_card_new_data_done(pa_card_new_data *data) { | ||
35 | pa_hashmap_free(data->ports); | ||
36 | |||
37 | pa_xfree(data->name); | ||
38 | - pa_xfree(data->active_profile); | ||
39 | } | ||
40 | |||
41 | pa_card *pa_card_new(pa_core *core, pa_card_new_data *data) { | ||
42 | diff --git a/src/pulsecore/card.h b/src/pulsecore/card.h | ||
43 | index fd1fe0a..5699475 100644 | ||
44 | --- a/src/pulsecore/card.h | ||
45 | +++ b/src/pulsecore/card.h | ||
46 | @@ -101,15 +101,11 @@ typedef struct pa_card_new_data { | ||
47 | pa_module *module; | ||
48 | |||
49 | pa_hashmap *profiles; | ||
50 | - char *active_profile; | ||
51 | - | ||
52 | pa_hashmap *ports; | ||
53 | pa_device_port *preferred_input_port; | ||
54 | pa_device_port *preferred_output_port; | ||
55 | |||
56 | bool namereg_fail:1; | ||
57 | - | ||
58 | - bool save_profile:1; | ||
59 | } pa_card_new_data; | ||
60 | |||
61 | typedef struct { | ||
62 | @@ -125,7 +121,6 @@ void pa_card_profile_set_available(pa_card_profile *c, pa_available_t available) | ||
63 | |||
64 | pa_card_new_data *pa_card_new_data_init(pa_card_new_data *data); | ||
65 | void pa_card_new_data_set_name(pa_card_new_data *data, const char *name); | ||
66 | -void pa_card_new_data_set_profile(pa_card_new_data *data, const char *profile); | ||
67 | void pa_card_new_data_set_preferred_port(pa_card_new_data *data, pa_direction_t direction, pa_device_port *port); | ||
68 | void pa_card_new_data_done(pa_card_new_data *data); | ||
69 | |||
70 | -- | ||
71 | 2.8.1 | ||
72 | |||