Skip to content

Commit fa14a41

Browse files
committed
hmm swear sliceds of nils were giving me trouble earlier
1 parent abb263c commit fa14a41

File tree

1 file changed

+1
-17
lines changed

1 file changed

+1
-17
lines changed

mpd/mpd.go

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,10 @@ type wrappedAdaptationSet AdaptationSet
159159

160160
// dtoAdaptationSet parses the items out of AdaptationSet
161161
// that give us trouble:
162-
// * slices of pointers
163162
// * Content Protection interface
164163
type dtoAdaptationSet struct {
165164
wrappedAdaptationSet
166-
Roles []Role `xml:"Role,omitempty"`
167-
Representations []Representation `xml:"Representation,omitempty"`
168-
AccessibilityElems []Accessibility `xml:"Accessibility,omitempty"`
169-
ContentProtection contentProtections `xml:"ContentProtection,omitempty"`
165+
ContentProtection contentProtections `xml:"ContentProtection,omitempty"`
170166
}
171167

172168
type AdaptationSet struct {
@@ -199,18 +195,6 @@ func (as *AdaptationSet) UnmarshalXML(d *xml.Decoder, start xml.StartElement) er
199195
return err
200196
}
201197
*as = AdaptationSet(n.wrappedAdaptationSet)
202-
as.Roles = make([]*Role, len(n.Roles))
203-
for i := range n.Roles {
204-
as.Roles[i] = &n.Roles[i]
205-
}
206-
as.Representations = make([]*Representation, len(n.Representations))
207-
for i := range n.Representations {
208-
as.Representations[i] = &n.Representations[i]
209-
}
210-
as.AccessibilityElems = make([]*Accessibility, len(n.AccessibilityElems))
211-
for i := range n.AccessibilityElems {
212-
as.AccessibilityElems[i] = &n.AccessibilityElems[i]
213-
}
214198
as.ContentProtection = make([]ContentProtectioner, len(n.ContentProtection))
215199
for i := range n.ContentProtection {
216200
as.ContentProtection[i] = n.ContentProtection[i]

0 commit comments

Comments
 (0)