diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-02-21 11:41:50 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-02-21 11:41:50 +0000 |
| commit | 817620394821a4581ea8cfd02fb23f2524169405 (patch) | |
| tree | 9b4788f28c69253952de9f5ef6bf3cfa34fda34d /src/wx | |
| parent | fe886ca75591e3122e7123590dd09bedbc549199 (diff) | |
Remove FFmpegStream id accessor.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/audio_panel.cc | 6 | ||||
| -rw-r--r-- | src/wx/subtitle_panel.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index 683751264..0838fa8ab 100644 --- a/src/wx/audio_panel.cc +++ b/src/wx/audio_panel.cc @@ -134,11 +134,11 @@ AudioPanel::film_content_changed (int property) if (fcs) { vector<shared_ptr<FFmpegAudioStream> > a = fcs->audio_streams (); for (vector<shared_ptr<FFmpegAudioStream> >::iterator i = a.begin(); i != a.end(); ++i) { - _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx (lexical_cast<string> ((*i)->id ())))); + _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx ((*i)->identifier ()))); } if (fcs->audio_stream()) { - checked_set (_stream, lexical_cast<string> (fcs->audio_stream()->id ())); + checked_set (_stream, fcs->audio_stream()->identifier ()); setup_stream_description (); } } @@ -206,7 +206,7 @@ AudioPanel::stream_changed () vector<shared_ptr<FFmpegAudioStream> > a = fcs->audio_streams (); vector<shared_ptr<FFmpegAudioStream> >::iterator i = a.begin (); string const s = string_client_data (_stream->GetClientObject (_stream->GetSelection ())); - while (i != a.end() && lexical_cast<string> ((*i)->id ()) != s) { + while (i != a.end() && (*i)->identifier () != s) { ++i; } diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc index 24e3688f8..63a18b0ce 100644 --- a/src/wx/subtitle_panel.cc +++ b/src/wx/subtitle_panel.cc @@ -120,11 +120,11 @@ SubtitlePanel::film_content_changed (int property) if (fcs) { vector<shared_ptr<FFmpegSubtitleStream> > s = fcs->subtitle_streams (); for (vector<shared_ptr<FFmpegSubtitleStream> >::iterator i = s.begin(); i != s.end(); ++i) { - _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx (lexical_cast<string> ((*i)->id ())))); + _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx ((*i)->identifier ()))); } if (fcs->subtitle_stream()) { - checked_set (_stream, lexical_cast<string> (fcs->subtitle_stream()->id ())); + checked_set (_stream, fcs->subtitle_stream()->identifier ()); } else { _stream->SetSelection (wxNOT_FOUND); } @@ -179,7 +179,7 @@ SubtitlePanel::stream_changed () vector<shared_ptr<FFmpegSubtitleStream> > a = fcs->subtitle_streams (); vector<shared_ptr<FFmpegSubtitleStream> >::iterator i = a.begin (); string const s = string_client_data (_stream->GetClientObject (_stream->GetSelection ())); - while (i != a.end() && lexical_cast<string> ((*i)->id ()) != s) { + while (i != a.end() && (*i)->identifier () != s) { ++i; } |