Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/midi/dynamically_initialized_midi_manager_win.h" | 5 #include "media/midi/dynamically_initialized_midi_manager_win.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 | 8 |
| 9 #include <mmreg.h> | 9 #include <mmreg.h> |
| 10 #include <mmsystem.h> | 10 #include <mmsystem.h> |
| 11 | 11 |
| 12 #include <algorithm> | 12 #include <algorithm> |
| 13 #include <string> | 13 #include <string> |
| 14 | 14 |
| 15 #include "base/callback.h" | 15 #include "base/callback.h" |
| 16 #include "base/logging.h" | 16 #include "base/logging.h" |
| 17 #include "base/memory/ptr_util.h" | 17 #include "base/memory/ptr_util.h" |
| 18 #include "base/strings/string16.h" | 18 #include "base/strings/string16.h" |
| 19 #include "base/strings/stringprintf.h" | 19 #include "base/strings/stringprintf.h" |
| 20 #include "base/strings/utf_string_conversions.h" | 20 #include "base/strings/utf_string_conversions.h" |
| 21 #include "base/synchronization/lock.h" | 21 #include "base/synchronization/lock.h" |
| 22 #include "base/time/time.h" | |
| 23 #include "media/midi/message_util.h" | |
| 22 #include "media/midi/midi_port_info.h" | 24 #include "media/midi/midi_port_info.h" |
| 23 #include "media/midi/midi_service.h" | 25 #include "media/midi/midi_service.h" |
| 24 | 26 |
| 25 namespace midi { | 27 namespace midi { |
| 26 | 28 |
| 27 namespace { | 29 namespace { |
| 28 | 30 |
| 31 // Assumes that nullptr represents an invalid MIDI handle. | |
| 32 constexpr HMIDIIN kInvalidInHandle = nullptr; | |
| 33 constexpr HMIDIOUT kInvalidOutHandle = nullptr; | |
| 34 | |
| 29 // Global variables to identify MidiManager instance. | 35 // Global variables to identify MidiManager instance. |
| 30 constexpr int kInvalidInstanceId = -1; | 36 constexpr int kInvalidInstanceId = -1; |
| 31 int g_active_instance_id = kInvalidInstanceId; | 37 int g_active_instance_id = kInvalidInstanceId; |
| 32 DynamicallyInitializedMidiManagerWin* g_manager_instance = nullptr; | 38 DynamicallyInitializedMidiManagerWin* g_manager_instance = nullptr; |
| 33 | 39 |
| 34 // Obtains base::Lock instance pointer to lock instance_id. | 40 // Obtains base::Lock instance pointer to lock instance_id. |
| 35 base::Lock* GetInstanceIdLock() { | 41 base::Lock* GetInstanceIdLock() { |
| 36 static base::Lock* lock = new base::Lock; | 42 static base::Lock* lock = new base::Lock; |
| 37 return lock; | 43 return lock; |
| 38 } | 44 } |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 62 base::AutoLock lock(*GetInstanceIdLock()); | 68 base::AutoLock lock(*GetInstanceIdLock()); |
| 63 if (instance_id != g_active_instance_id) | 69 if (instance_id != g_active_instance_id) |
| 64 return; | 70 return; |
| 65 } | 71 } |
| 66 task.Run(); | 72 task.Run(); |
| 67 } | 73 } |
| 68 | 74 |
| 69 // TODO(toyoshim): Factor out TaskRunner related functionaliries above, and | 75 // TODO(toyoshim): Factor out TaskRunner related functionaliries above, and |
| 70 // deprecate MidiScheduler. It should be available via MidiManager::scheduler(). | 76 // deprecate MidiScheduler. It should be available via MidiManager::scheduler(). |
| 71 | 77 |
| 78 // Helper functions to close MIDI device handles on TaskRunner asynchronously. | |
| 79 void FinalizeInPort(HMIDIIN handle) { | |
| 80 midiInClose(handle); | |
| 81 } | |
| 82 | |
| 83 void FinalizeOutPort(HMIDIOUT handle) { | |
| 84 midiOutClose(handle); | |
| 85 } | |
| 86 | |
| 87 // Handles MIDI input port callbacks that runs on a system provided thread. | |
| 88 void CALLBACK HandleMidiInCallback(HMIDIIN hmi, | |
| 89 UINT msg, | |
| 90 DWORD_PTR instance, | |
| 91 DWORD_PTR param1, | |
| 92 DWORD_PTR param2) { | |
| 93 // TODO(toyoshim): Following patches will implement actual functions. | |
| 94 } | |
| 95 | |
| 96 // Handles MIDI output port callbacks that runs on a system provided thread. | |
| 97 void CALLBACK HandleMidiOutCallback(HMIDIOUT hmo, | |
| 98 UINT msg, | |
| 99 DWORD_PTR instance, | |
| 100 DWORD_PTR param1, | |
| 101 DWORD_PTR param2) { | |
| 102 // TODO(toyoshim): Following patches will implement actual functions. | |
| 103 } | |
| 104 | |
| 72 class Port { | 105 class Port { |
| 73 public: | 106 public: |
| 74 Port(const std::string& type, | 107 Port(const std::string& type, |
| 75 uint32_t device_id, | 108 uint32_t device_id, |
| 76 uint16_t manufacturer_id, | 109 uint16_t manufacturer_id, |
| 77 uint16_t product_id, | 110 uint16_t product_id, |
| 78 uint32_t driver_version, | 111 uint32_t driver_version, |
| 79 const std::string& product_name) | 112 const std::string& product_name) |
| 80 : index_(0u), | 113 : index_(0u), |
| 81 type_(type), | 114 type_(type), |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 148 const uint32_t driver_version_; | 181 const uint32_t driver_version_; |
| 149 const std::string product_name_; | 182 const std::string product_name_; |
| 150 MidiPortInfo info_; | 183 MidiPortInfo info_; |
| 151 }; // class Port | 184 }; // class Port |
| 152 | 185 |
| 153 } // namespace | 186 } // namespace |
| 154 | 187 |
| 155 // TODO(toyoshim): Following patches will implement actual functions. | 188 // TODO(toyoshim): Following patches will implement actual functions. |
| 156 class DynamicallyInitializedMidiManagerWin::InPort final : public Port { | 189 class DynamicallyInitializedMidiManagerWin::InPort final : public Port { |
| 157 public: | 190 public: |
| 158 InPort(UINT device_id, const MIDIINCAPS2W& caps) | 191 InPort(int instance_id, UINT device_id, const MIDIINCAPS2W& caps) |
| 159 : Port("input", | 192 : Port("input", |
| 160 device_id, | 193 device_id, |
| 161 caps.wMid, | 194 caps.wMid, |
| 162 caps.wPid, | 195 caps.wPid, |
| 163 caps.vDriverVersion, | 196 caps.vDriverVersion, |
| 164 base::WideToUTF8( | 197 base::WideToUTF8( |
| 165 base::string16(caps.szPname, wcslen(caps.szPname)))) {} | 198 base::string16(caps.szPname, wcslen(caps.szPname)))), |
| 199 in_handle_(kInvalidInHandle), | |
| 200 instance_id_(instance_id) {} | |
| 166 | 201 |
| 167 static std::vector<std::unique_ptr<InPort>> EnumerateActivePorts() { | 202 static std::vector<std::unique_ptr<InPort>> EnumerateActivePorts( |
| 203 int instance_id) { | |
| 168 std::vector<std::unique_ptr<InPort>> ports; | 204 std::vector<std::unique_ptr<InPort>> ports; |
| 169 const UINT num_devices = midiInGetNumDevs(); | 205 const UINT num_devices = midiInGetNumDevs(); |
| 170 for (UINT device_id = 0; device_id < num_devices; ++device_id) { | 206 for (UINT device_id = 0; device_id < num_devices; ++device_id) { |
| 171 MIDIINCAPS2W caps; | 207 MIDIINCAPS2W caps; |
| 172 MMRESULT result = midiInGetDevCaps( | 208 MMRESULT result = midiInGetDevCaps( |
| 173 device_id, reinterpret_cast<LPMIDIINCAPSW>(&caps), sizeof(caps)); | 209 device_id, reinterpret_cast<LPMIDIINCAPSW>(&caps), sizeof(caps)); |
| 174 if (result != MMSYSERR_NOERROR) { | 210 if (result != MMSYSERR_NOERROR) { |
| 175 LOG(ERROR) << "midiInGetDevCaps fails on device " << device_id; | 211 LOG(ERROR) << "midiInGetDevCaps fails on device " << device_id; |
| 176 continue; | 212 continue; |
| 177 } | 213 } |
| 178 ports.push_back(base::MakeUnique<InPort>(device_id, caps)); | 214 ports.push_back(base::MakeUnique<InPort>(instance_id, device_id, caps)); |
| 179 } | 215 } |
| 180 return ports; | 216 return ports; |
| 181 } | 217 } |
| 182 | 218 |
| 219 void Finalize(scoped_refptr<base::SingleThreadTaskRunner> runner) { | |
| 220 if (in_handle_ != kInvalidInHandle) { | |
| 221 runner->PostTask(FROM_HERE, base::Bind(&FinalizeInPort, in_handle_)); | |
| 222 } | |
| 223 } | |
| 224 | |
| 183 void NotifyPortStateSet(DynamicallyInitializedMidiManagerWin* manager) { | 225 void NotifyPortStateSet(DynamicallyInitializedMidiManagerWin* manager) { |
| 184 manager->PostReplyTask( | 226 manager->PostReplyTask( |
| 185 base::Bind(&DynamicallyInitializedMidiManagerWin::SetInputPortState, | 227 base::Bind(&DynamicallyInitializedMidiManagerWin::SetInputPortState, |
| 186 base::Unretained(manager), index_, info_.state)); | 228 base::Unretained(manager), index_, info_.state)); |
| 187 } | 229 } |
| 188 | 230 |
| 189 void NotifyPortAdded(DynamicallyInitializedMidiManagerWin* manager) { | 231 void NotifyPortAdded(DynamicallyInitializedMidiManagerWin* manager) { |
| 190 manager->PostReplyTask( | 232 manager->PostReplyTask( |
| 191 base::Bind(&DynamicallyInitializedMidiManagerWin::AddInputPort, | 233 base::Bind(&DynamicallyInitializedMidiManagerWin::AddInputPort, |
| 192 base::Unretained(manager), info_)); | 234 base::Unretained(manager), info_)); |
| 193 } | 235 } |
| 236 | |
| 237 // Port overrides: | |
| 238 void Open() override { | |
| 239 MMRESULT result = | |
| 240 midiInOpen(&in_handle_, device_id_, | |
| 241 reinterpret_cast<DWORD_PTR>(&HandleMidiInCallback), | |
| 242 instance_id_, CALLBACK_FUNCTION); | |
| 243 if (result == MMSYSERR_NOERROR) | |
| 244 Port::Open(); | |
| 245 else | |
| 246 Disconnect(); | |
| 247 } | |
| 248 | |
| 249 private: | |
| 250 HMIDIIN in_handle_; | |
| 251 int instance_id_; | |
| 194 }; | 252 }; |
| 195 | 253 |
| 196 // TODO(toyoshim): Following patches will implement actual functions. | 254 // TODO(toyoshim): Following patches will implement actual functions. |
| 197 class DynamicallyInitializedMidiManagerWin::OutPort final : public Port { | 255 class DynamicallyInitializedMidiManagerWin::OutPort final : public Port { |
| 198 public: | 256 public: |
| 199 OutPort(UINT device_id, const MIDIOUTCAPS2W& caps) | 257 OutPort(UINT device_id, const MIDIOUTCAPS2W& caps) |
| 200 : Port("output", | 258 : Port("output", |
| 201 device_id, | 259 device_id, |
| 202 caps.wMid, | 260 caps.wMid, |
| 203 caps.wPid, | 261 caps.wPid, |
| 204 caps.vDriverVersion, | 262 caps.vDriverVersion, |
| 205 base::WideToUTF8( | 263 base::WideToUTF8( |
| 206 base::string16(caps.szPname, wcslen(caps.szPname)))), | 264 base::string16(caps.szPname, wcslen(caps.szPname)))), |
| 207 software_(caps.wTechnology == MOD_SWSYNTH) {} | 265 software_(caps.wTechnology == MOD_SWSYNTH), |
| 266 out_handle_(kInvalidOutHandle) {} | |
| 208 | 267 |
| 209 static std::vector<std::unique_ptr<OutPort>> EnumerateActivePorts() { | 268 static std::vector<std::unique_ptr<OutPort>> EnumerateActivePorts() { |
| 210 std::vector<std::unique_ptr<OutPort>> ports; | 269 std::vector<std::unique_ptr<OutPort>> ports; |
| 211 const UINT num_devices = midiOutGetNumDevs(); | 270 const UINT num_devices = midiOutGetNumDevs(); |
| 212 for (UINT device_id = 0; device_id < num_devices; ++device_id) { | 271 for (UINT device_id = 0; device_id < num_devices; ++device_id) { |
| 213 MIDIOUTCAPS2W caps; | 272 MIDIOUTCAPS2W caps; |
| 214 MMRESULT result = midiOutGetDevCaps( | 273 MMRESULT result = midiOutGetDevCaps( |
| 215 device_id, reinterpret_cast<LPMIDIOUTCAPSW>(&caps), sizeof(caps)); | 274 device_id, reinterpret_cast<LPMIDIOUTCAPSW>(&caps), sizeof(caps)); |
| 216 if (result != MMSYSERR_NOERROR) { | 275 if (result != MMSYSERR_NOERROR) { |
| 217 LOG(ERROR) << "midiOutGetDevCaps fails on device " << device_id; | 276 LOG(ERROR) << "midiOutGetDevCaps fails on device " << device_id; |
| 218 continue; | 277 continue; |
| 219 } | 278 } |
| 220 ports.push_back(base::MakeUnique<OutPort>(device_id, caps)); | 279 ports.push_back(base::MakeUnique<OutPort>(device_id, caps)); |
| 221 } | 280 } |
| 222 return ports; | 281 return ports; |
| 223 } | 282 } |
| 224 | 283 |
| 225 // Port overrides: | 284 void Finalize(scoped_refptr<base::SingleThreadTaskRunner> runner) { |
| 226 bool Connect() override { | 285 if (out_handle_ != kInvalidOutHandle) |
| 227 // Until |software| option is supported, disable Microsoft GS Wavetable | 286 runner->PostTask(FROM_HERE, base::Bind(&FinalizeOutPort, out_handle_)); |
| 228 // Synth that has a known security issue. | |
| 229 if (software_ && manufacturer_id_ == MM_MICROSOFT && | |
| 230 (product_id_ == MM_MSFT_WDMAUDIO_MIDIOUT || | |
| 231 product_id_ == MM_MSFT_GENERIC_MIDISYNTH)) { | |
| 232 return false; | |
| 233 } | |
| 234 return Port::Connect(); | |
| 235 } | 287 } |
| 236 | 288 |
| 237 // Port Overrides: | |
|
Takashi Toyoshima
2017/02/21 05:54:28
I forgot to remove this stale line.
| |
| 238 void NotifyPortStateSet(DynamicallyInitializedMidiManagerWin* manager) { | 289 void NotifyPortStateSet(DynamicallyInitializedMidiManagerWin* manager) { |
| 239 manager->PostReplyTask( | 290 manager->PostReplyTask( |
| 240 base::Bind(&DynamicallyInitializedMidiManagerWin::SetOutputPortState, | 291 base::Bind(&DynamicallyInitializedMidiManagerWin::SetOutputPortState, |
| 241 base::Unretained(manager), index_, info_.state)); | 292 base::Unretained(manager), index_, info_.state)); |
| 242 } | 293 } |
| 243 | 294 |
| 244 void NotifyPortAdded(DynamicallyInitializedMidiManagerWin* manager) { | 295 void NotifyPortAdded(DynamicallyInitializedMidiManagerWin* manager) { |
| 245 manager->PostReplyTask( | 296 manager->PostReplyTask( |
| 246 base::Bind(&DynamicallyInitializedMidiManagerWin::AddOutputPort, | 297 base::Bind(&DynamicallyInitializedMidiManagerWin::AddOutputPort, |
| 247 base::Unretained(manager), info_)); | 298 base::Unretained(manager), info_)); |
| 248 } | 299 } |
| 249 | 300 |
| 301 // Port overrides: | |
| 302 bool Connect() override { | |
|
Takashi Toyoshima
2017/02/21 05:54:28
Connect() method is just replaced here so that we
| |
| 303 // Until |software| option is supported, disable Microsoft GS Wavetable | |
| 304 // Synth that has a known security issue. | |
| 305 if (software_ && manufacturer_id_ == MM_MICROSOFT && | |
| 306 (product_id_ == MM_MSFT_WDMAUDIO_MIDIOUT || | |
| 307 product_id_ == MM_MSFT_GENERIC_MIDISYNTH)) { | |
| 308 return false; | |
| 309 } | |
| 310 return Port::Connect(); | |
| 311 } | |
| 312 | |
| 313 void Open() override { | |
| 314 MMRESULT result = | |
| 315 midiOutOpen(&out_handle_, device_id_, | |
| 316 reinterpret_cast<DWORD_PTR>(&HandleMidiOutCallback), 0, | |
| 317 CALLBACK_FUNCTION); | |
| 318 if (result == MMSYSERR_NOERROR) { | |
| 319 Port::Open(); | |
| 320 } else { | |
| 321 out_handle_ = kInvalidOutHandle; | |
| 322 Disconnect(); | |
| 323 } | |
| 324 } | |
| 325 | |
| 250 const bool software_; | 326 const bool software_; |
| 327 HMIDIOUT out_handle_; | |
| 251 }; | 328 }; |
| 252 | 329 |
| 253 DynamicallyInitializedMidiManagerWin::DynamicallyInitializedMidiManagerWin( | 330 DynamicallyInitializedMidiManagerWin::DynamicallyInitializedMidiManagerWin( |
| 254 MidiService* service) | 331 MidiService* service) |
| 255 : MidiManager(service), instance_id_(IssueNextInstanceId()) { | 332 : MidiManager(service), instance_id_(IssueNextInstanceId()) { |
| 256 base::AutoLock lock(*GetInstanceIdLock()); | 333 base::AutoLock lock(*GetInstanceIdLock()); |
| 257 CHECK_EQ(kInvalidInstanceId, g_active_instance_id); | 334 CHECK_EQ(kInvalidInstanceId, g_active_instance_id); |
| 258 | 335 |
| 259 // Obtains the task runner for the current thread that hosts this instnace. | 336 // Obtains the task runner for the current thread that hosts this instnace. |
| 260 thread_runner_ = base::ThreadTaskRunnerHandle::Get(); | 337 thread_runner_ = base::ThreadTaskRunnerHandle::Get(); |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 298 CHECK_EQ(instance_id_, g_active_instance_id); | 375 CHECK_EQ(instance_id_, g_active_instance_id); |
| 299 g_active_instance_id = kInvalidInstanceId; | 376 g_active_instance_id = kInvalidInstanceId; |
| 300 CHECK_EQ(this, g_manager_instance); | 377 CHECK_EQ(this, g_manager_instance); |
| 301 g_manager_instance = nullptr; | 378 g_manager_instance = nullptr; |
| 302 } | 379 } |
| 303 | 380 |
| 304 // Ensures that no task runs on TaskRunner so to destruct the instance safely. | 381 // Ensures that no task runs on TaskRunner so to destruct the instance safely. |
| 305 // Tasks that did not started yet will do nothing after invalidate the | 382 // Tasks that did not started yet will do nothing after invalidate the |
| 306 // instance ID above. | 383 // instance ID above. |
| 307 base::AutoLock lock(*GetTaskLock()); | 384 base::AutoLock lock(*GetTaskLock()); |
| 385 | |
| 386 // Posts tasks that finalize each device port without MidiManager instance | |
| 387 // on TaskRunner. If another MidiManager instance is created, its | |
| 388 // initialization runs on the same task runner after all tasks posted here | |
| 389 // finish. | |
| 390 for (const auto& port : input_ports_) | |
| 391 port->Finalize(service()->GetTaskRunner(kTaskRunner)); | |
| 392 for (const auto& port : output_ports_) | |
| 393 port->Finalize(service()->GetTaskRunner(kTaskRunner)); | |
| 308 } | 394 } |
| 309 | 395 |
| 310 void DynamicallyInitializedMidiManagerWin::DispatchSendMidiData( | 396 void DynamicallyInitializedMidiManagerWin::DispatchSendMidiData( |
| 311 MidiManagerClient* client, | 397 MidiManagerClient* client, |
| 312 uint32_t port_index, | 398 uint32_t port_index, |
| 313 const std::vector<uint8_t>& data, | 399 const std::vector<uint8_t>& data, |
| 314 double timestamp) { | 400 double timestamp) { |
| 315 // TODO(toyoshim): Following patches will implement. | 401 // TODO(toyoshim): Following patches will implement. |
| 316 } | 402 } |
| 317 | 403 |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 342 | 428 |
| 343 void DynamicallyInitializedMidiManagerWin::InitializeOnTaskRunner() { | 429 void DynamicallyInitializedMidiManagerWin::InitializeOnTaskRunner() { |
| 344 UpdateDeviceListOnTaskRunner(); | 430 UpdateDeviceListOnTaskRunner(); |
| 345 PostReplyTask( | 431 PostReplyTask( |
| 346 base::Bind(&DynamicallyInitializedMidiManagerWin::CompleteInitialization, | 432 base::Bind(&DynamicallyInitializedMidiManagerWin::CompleteInitialization, |
| 347 base::Unretained(this), mojom::Result::OK)); | 433 base::Unretained(this), mojom::Result::OK)); |
| 348 } | 434 } |
| 349 | 435 |
| 350 void DynamicallyInitializedMidiManagerWin::UpdateDeviceListOnTaskRunner() { | 436 void DynamicallyInitializedMidiManagerWin::UpdateDeviceListOnTaskRunner() { |
| 351 std::vector<std::unique_ptr<InPort>> active_input_ports = | 437 std::vector<std::unique_ptr<InPort>> active_input_ports = |
| 352 InPort::EnumerateActivePorts(); | 438 InPort::EnumerateActivePorts(instance_id_); |
| 353 ReflectActiveDeviceList(this, &input_ports_, &active_input_ports); | 439 ReflectActiveDeviceList(this, &input_ports_, &active_input_ports); |
| 354 | 440 |
| 355 std::vector<std::unique_ptr<OutPort>> active_output_ports = | 441 std::vector<std::unique_ptr<OutPort>> active_output_ports = |
| 356 OutPort::EnumerateActivePorts(); | 442 OutPort::EnumerateActivePorts(); |
| 357 ReflectActiveDeviceList(this, &output_ports_, &active_output_ports); | 443 ReflectActiveDeviceList(this, &output_ports_, &active_output_ports); |
| 358 | 444 |
| 359 // TODO(toyoshim): This method may run before internal MIDI device lists that | 445 // TODO(toyoshim): This method may run before internal MIDI device lists that |
| 360 // Windows manages were updated. This may be because MIDI driver may be loaded | 446 // Windows manages were updated. This may be because MIDI driver may be loaded |
| 361 // after the raw device list was updated. To avoid this problem, we may want | 447 // after the raw device list was updated. To avoid this problem, we may want |
| 362 // to retry device check later if no changes are detected here. | 448 // to retry device check later if no changes are detected here. |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 391 size_t index = known_ports->size(); | 477 size_t index = known_ports->size(); |
| 392 port->set_index(index); | 478 port->set_index(index); |
| 393 known_ports->push_back(std::move(port)); | 479 known_ports->push_back(std::move(port)); |
| 394 (*known_ports)[index]->Connect(); | 480 (*known_ports)[index]->Connect(); |
| 395 (*known_ports)[index]->NotifyPortAdded(this); | 481 (*known_ports)[index]->NotifyPortAdded(this); |
| 396 } | 482 } |
| 397 } | 483 } |
| 398 } | 484 } |
| 399 | 485 |
| 400 } // namespace midi | 486 } // namespace midi |
| OLD | NEW |