diff options
| author | David Seikel | 2011-02-20 20:31:57 +1000 |
|---|---|---|
| committer | David Seikel | 2011-02-20 20:31:57 +1000 |
| commit | d6666d0776985bada40f19c623b86d82a4113f92 (patch) | |
| tree | eb4d234a313c51b40f6d53d4a59bdc831a7cd0fc /linden/indra/llaudio/llstreamingaudio.h | |
| parent | Remove catering to LL's probably illegal attempt to block copying of open sou... (diff) | |
| parent | Reduce the logging spam to warnings. Debug was too much. (diff) | |
| download | meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.zip meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.gz meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.bz2 meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.xz | |
Merge branch 'weekly' into branding
Conflicts (solved):
linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llappviewerwin32.cpp
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llaudio/llstreamingaudio.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llaudio/llstreamingaudio.h b/linden/indra/llaudio/llstreamingaudio.h index aa89e6a..f5d5334 100644 --- a/linden/indra/llaudio/llstreamingaudio.h +++ b/linden/indra/llaudio/llstreamingaudio.h | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | #include "stdtypes.h" // from llcommon | 37 | #include "stdtypes.h" // from llcommon |
| 38 | 38 | ||
| 39 | // Entirely abstract. Based exactly on the historic API. | 39 | // Entirely abstract. Based on the historic API. |
| 40 | class LLStreamingAudioInterface | 40 | class LLStreamingAudioInterface |
| 41 | { | 41 | { |
| 42 | public: | 42 | public: |
| @@ -51,6 +51,7 @@ class LLStreamingAudioInterface | |||
| 51 | virtual void setGain(F32 vol) = 0; | 51 | virtual void setGain(F32 vol) = 0; |
| 52 | virtual F32 getGain() = 0; | 52 | virtual F32 getGain() = 0; |
| 53 | virtual std::string getURL() = 0; | 53 | virtual std::string getURL() = 0; |
| 54 | virtual std::string getVersion() = 0; | ||
| 54 | }; | 55 | }; |
| 55 | 56 | ||
| 56 | #endif // LL_STREAMINGAUDIO_H | 57 | #endif // LL_STREAMINGAUDIO_H |