topology: Fix missing stream name of widgets in text conf file

User can define the stream name of an input/output widget in the text conf
file, by setting "stream_name" of a SectionWidget.

Topology C API and kernel already have support for configuring a widget's
stream name. This patch just adds the missing part of the text conf file.

Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/topology.h b/include/topology.h
index 0675b527bcdaf5443c6c13ac6334a33358ea845f..a0d018e472b9a003bff857989a3894c218adfcf3 100644 (file)
--- a/include/topology.h
+++ b/include/topology.h
@@ -483,6 +483,7 @@ extern "C" {
  *     index "1"                       # Index number
  *
  *     type "aif_in"                   # Widget type - detailed above
+ *     stream_name "name"              # Stream name
  *
  *     no_pm "true"                    # No PM control bit.
  *     reg "20"                        # PM bit register offset

diff --git a/src/topology/dapm.c b/src/topology/dapm.c
index e3c90d83fb75d95ab9e1b68e02929750581de0f8..9fa0aac0cb9a7e494977ce3a826a985d61180b26 100644 (file)
--- a/src/topology/dapm.c
+++ b/src/topology/dapm.c
@@ -507,6 +507,16 @@ int tplg_parse_dapm_widget(snd_tplg_t *tplg,
                        continue;
                }
 
+               if (strcmp(id, "stream_name") == 0) {
+                       if (snd_config_get_string(n, &val) < 0)
+                               return -EINVAL;
+
+                       elem_copy_text(widget->sname, val,
+                                      SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
+                       tplg_dbg("\t%s: %s\n", id, val);
+                       continue;
+               }
+
                if (strcmp(id, "no_pm") == 0) {
                        if (snd_config_get_string(n, &val) < 0)
                                return -EINVAL;