diff options
author | Armin Weatherwax | 2010-07-10 14:35:58 +0200 |
---|---|---|
committer | Armin Weatherwax | 2010-09-23 15:47:28 +0200 |
commit | f41c6363087f95ce5f7d99385e455d7e0105d883 (patch) | |
tree | 7574f66a2e8123610588e8b66f2e444850163801 /linden/indra/newview/lloverlaybar.cpp | |
parent | Fixed plugin compile issues on windows (diff) | |
download | meta-impy-f41c6363087f95ce5f7d99385e455d7e0105d883.zip meta-impy-f41c6363087f95ce5f7d99385e455d7e0105d883.tar.gz meta-impy-f41c6363087f95ce5f7d99385e455d7e0105d883.tar.bz2 meta-impy-f41c6363087f95ce5f7d99385e455d7e0105d883.tar.xz |
Imprudence style gstreamer plugin (remove llgst, syms and such)
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/lloverlaybar.cpp | 52 |
1 files changed, 1 insertions, 51 deletions
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp index e903df7..e713e22 100644 --- a/linden/indra/newview/lloverlaybar.cpp +++ b/linden/indra/newview/lloverlaybar.cpp | |||
@@ -43,7 +43,7 @@ | |||
43 | #include "llagent.h" | 43 | #include "llagent.h" |
44 | #include "llbutton.h" | 44 | #include "llbutton.h" |
45 | #include "llchatbar.h" | 45 | #include "llchatbar.h" |
46 | #include "llfloaterchat.h" | 46 | //#include "llfloaterchat.h" |
47 | #include "llfocusmgr.h" | 47 | #include "llfocusmgr.h" |
48 | #include "llimview.h" | 48 | #include "llimview.h" |
49 | #include "llmediaremotectrl.h" | 49 | #include "llmediaremotectrl.h" |
@@ -75,60 +75,10 @@ LLOverlayBar *gOverlayBar = NULL; | |||
75 | 75 | ||
76 | extern S32 MENU_BAR_HEIGHT; | 76 | extern S32 MENU_BAR_HEIGHT; |
77 | 77 | ||
78 | //awfixme | ||
79 | /* | ||
80 | class LLTitleObserver | ||
81 | : public LLMediaObserver | ||
82 | { | ||
83 | public: | ||
84 | void init(std::string url); | ||
85 | *//*virtual*//* void onMediaTitleChange(const EventType& event_in); | ||
86 | private: | ||
87 | LLMediaBase* mMediaSource; | ||
88 | }; | ||
89 | |||
90 | static LLTitleObserver sTitleObserver; | ||
91 | |||
92 | static LLRegisterWidget<LLMediaRemoteCtrl> r("media_remote"); | ||
93 | |||
94 | void LLTitleObserver::init(std::string url) | ||
95 | { | ||
96 | |||
97 | if (!gAudiop) | ||
98 | { | ||
99 | return; | ||
100 | } | ||
101 | |||
102 | mMediaSource = gAudiop->getStreamMedia(); // LLViewerMedia::getSource(); | ||
103 | |||
104 | if ( mMediaSource ) | ||
105 | { | ||
106 | mMediaSource->addObserver(this); | ||
107 | } | ||
108 | } | ||
109 | |||
110 | //virtual | ||
111 | void LLTitleObserver::onMediaTitleChange(const EventType& event_in) | ||
112 | { | ||
113 | if ( !gSavedSettings.getBOOL("ShowStreamTitle") ) | ||
114 | { | ||
115 | return; | ||
116 | } | ||
117 | |||
118 | LLChat chat; | ||
119 | //TODO: set this in XUI | ||
120 | std::string playing_msg = "Playing: " + event_in.getStringValue(); | ||
121 | chat.mText = playing_msg; | ||
122 | LLFloaterChat::addChat(chat, FALSE, FALSE); | ||
123 | } | ||
124 | */ | ||
125 | |||
126 | // | 78 | // |
127 | // Functions | 79 | // Functions |
128 | // | 80 | // |
129 | 81 | ||
130 | |||
131 | |||
132 | void* LLOverlayBar::createMediaRemote(void* userdata) | 82 | void* LLOverlayBar::createMediaRemote(void* userdata) |
133 | { | 83 | { |
134 | LLOverlayBar *self = (LLOverlayBar*)userdata; | 84 | LLOverlayBar *self = (LLOverlayBar*)userdata; |