Changeset 7f06456a573f5f4b951005035140bcd13c377495
- Timestamp:
- 06/14/08 10:09:06 (3 months ago)
- git-parent:
- Files:
-
- projects/activex/vlccontrol2.cpp (modified) (38 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
projects/activex/vlccontrol2.cpp
r6a0f2d4 r7f06456 123 123 libvlc_exception_init(&ex); 124 124 125 *mute = libvlc_audio_get_mute(p_libvlc, &ex) ? VARIANT_TRUE : VARIANT_FALSE; 126 if( libvlc_exception_raised(&ex) ) 127 { 128 _p_instance->setErrorInfo(IID_IVLCAudio, libvlc_exception_get_message(&ex)); 129 libvlc_exception_clear(&ex); 130 return E_FAIL; 131 } 132 return NOERROR; 133 } 134 return hr; 135 }; 136 137 STDMETHODIMP VLCAudio::put_mute(VARIANT_BOOL mute) 138 { 139 libvlc_instance_t* p_libvlc; 140 HRESULT hr = _p_instance->getVLC(&p_libvlc); 141 if( SUCCEEDED(hr) ) 142 { 143 libvlc_exception_t ex; 144 libvlc_exception_init(&ex); 145 146 libvlc_audio_set_mute(p_libvlc, VARIANT_FALSE != mute, &ex); 147 if( libvlc_exception_raised(&ex) ) 148 { 149 _p_instance->setErrorInfo(IID_IVLCAudio, libvlc_exception_get_message(&ex)); 150 libvlc_exception_clear(&ex); 151 return E_FAIL; 152 } 153 return NOERROR; 154 } 155 return hr; 156 }; 157 158 STDMETHODIMP VLCAudio::get_volume(long* volume) 159 { 160 if( NULL == volume ) 161 return E_POINTER; 162 163 libvlc_instance_t* p_libvlc; 164 HRESULT hr = _p_instance->getVLC(&p_libvlc); 165 if( SUCCEEDED(hr) ) 166 { 167 libvlc_exception_t ex; 168 libvlc_exception_init(&ex); 169 170 *volume = libvlc_audio_get_volume(p_libvlc, &ex); 171 if( libvlc_exception_raised(&ex) ) 172 { 173 _p_instance->setErrorInfo(IID_IVLCAudio, libvlc_exception_get_message(&ex)); 174 libvlc_exception_clear(&ex); 175 return E_FAIL; 176 } 177 return NOERROR; 178 } 179 return hr; 180 }; 181 182 STDMETHODIMP VLCAudio::put_volume(long volume) 183 { 184 libvlc_instance_t* p_libvlc; 185 HRESULT hr = _p_instance->getVLC(&p_libvlc); 186 if( SUCCEEDED(hr) ) 187 { 188 libvlc_exception_t ex; 189 libvlc_exception_init(&ex); 190 191 libvlc_audio_set_volume(p_libvlc, volume, &ex); 125 *mute = libvlc_audio_get_mute(p_libvlc, &ex) ? 126 VARIANT_TRUE : VARIANT_FALSE; 192 127 if( libvlc_exception_raised(&ex) ) 193 128 { … … 202 137 }; 203 138 204 STDMETHODIMP VLCAudio::get_track(long* track) 205 { 206 if( NULL == track ) 207 return E_POINTER; 208 209 libvlc_instance_t* p_libvlc; 210 HRESULT hr = _p_instance->getVLC(&p_libvlc); 211 if( SUCCEEDED(hr) ) 212 { 213 libvlc_exception_t ex; 214 libvlc_exception_init(&ex); 215 216 libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 217 *track = libvlc_audio_get_track(p_md, &ex); 218 libvlc_media_player_release(p_md); 139 STDMETHODIMP VLCAudio::put_mute(VARIANT_BOOL mute) 140 { 141 libvlc_instance_t* p_libvlc; 142 HRESULT hr = _p_instance->getVLC(&p_libvlc); 143 if( SUCCEEDED(hr) ) 144 { 145 libvlc_exception_t ex; 146 libvlc_exception_init(&ex); 147 148 libvlc_audio_set_mute(p_libvlc, VARIANT_FALSE != mute, &ex); 219 149 if( libvlc_exception_raised(&ex) ) 220 150 { … … 229 159 }; 230 160 231 STDMETHODIMP VLCAudio::put_track(long track) 232 { 233 libvlc_instance_t* p_libvlc; 234 HRESULT hr = _p_instance->getVLC(&p_libvlc); 235 if( SUCCEEDED(hr) ) 236 { 237 libvlc_exception_t ex; 238 libvlc_exception_init(&ex); 239 240 libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 241 libvlc_audio_set_track(p_md, track, &ex); 242 libvlc_media_player_release(p_md); 161 STDMETHODIMP VLCAudio::get_volume(long* volume) 162 { 163 if( NULL == volume ) 164 return E_POINTER; 165 166 libvlc_instance_t* p_libvlc; 167 HRESULT hr = _p_instance->getVLC(&p_libvlc); 168 if( SUCCEEDED(hr) ) 169 { 170 libvlc_exception_t ex; 171 libvlc_exception_init(&ex); 172 173 *volume = libvlc_audio_get_volume(p_libvlc, &ex); 243 174 if( libvlc_exception_raised(&ex) ) 244 175 { … … 253 184 }; 254 185 186 STDMETHODIMP VLCAudio::put_volume(long volume) 187 { 188 libvlc_instance_t* p_libvlc; 189 HRESULT hr = _p_instance->getVLC(&p_libvlc); 190 if( SUCCEEDED(hr) ) 191 { 192 libvlc_exception_t ex; 193 libvlc_exception_init(&ex); 194 195 libvlc_audio_set_volume(p_libvlc, volume, &ex); 196 if( libvlc_exception_raised(&ex) ) 197 { 198 _p_instance->setErrorInfo(IID_IVLCAudio, 199 libvlc_exception_get_message(&ex)); 200 libvlc_exception_clear(&ex); 201 return E_FAIL; 202 } 203 return NOERROR; 204 } 205 return hr; 206 }; 207 208 STDMETHODIMP VLCAudio::get_track(long* track) 209 { 210 if( NULL == track ) 211 return E_POINTER; 212 213 libvlc_instance_t* p_libvlc; 214 HRESULT hr = _p_instance->getVLC(&p_libvlc); 215 if( SUCCEEDED(hr) ) 216 { 217 libvlc_exception_t ex; 218 libvlc_exception_init(&ex); 219 220 libvlc_media_player_t *p_md; 221 p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 222 *track = libvlc_audio_get_track(p_md, &ex); 223 libvlc_media_player_release(p_md); 224 if( libvlc_exception_raised(&ex) ) 225 { 226 _p_instance->setErrorInfo(IID_IVLCAudio, 227 libvlc_exception_get_message(&ex)); 228 libvlc_exception_clear(&ex); 229 return E_FAIL; 230 } 231 return NOERROR; 232 } 233 return hr; 234 }; 235 236 STDMETHODIMP VLCAudio::put_track(long track) 237 { 238 libvlc_instance_t* p_libvlc; 239 HRESULT hr = _p_instance->getVLC(&p_libvlc); 240 if( SUCCEEDED(hr) ) 241 { 242 libvlc_exception_t ex; 243 libvlc_exception_init(&ex); 244 245 libvlc_media_player_t *p_md; 246 p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 247 libvlc_audio_set_track(p_md, track, &ex); 248 libvlc_media_player_release(p_md); 249 if( libvlc_exception_raised(&ex) ) 250 { 251 _p_instance->setErrorInfo(IID_IVLCAudio, 252 libvlc_exception_get_message(&ex)); 253 libvlc_exception_clear(&ex); 254 return E_FAIL; 255 } 256 return NOERROR; 257 } 258 return hr; 259 }; 260 255 261 STDMETHODIMP VLCAudio::get_channel(long *channel) 256 262 { … … 414 420 libvlc_exception_init(&ex); 415 421 416 libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 422 libvlc_media_player_t *p_md; 423 p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 417 424 if( ! libvlc_exception_raised(&ex) ) 418 425 { … … 424 431 } 425 432 } 426 _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex)); 433 _p_instance->setErrorInfo(IID_IVLCInput, 434 libvlc_exception_get_message(&ex)); 427 435 libvlc_exception_clear(&ex); 428 436 return E_FAIL; … … 444 452 libvlc_exception_init(&ex); 445 453 446 libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 454 libvlc_media_player_t *p_md; 455 p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 447 456 if( ! libvlc_exception_raised(&ex) ) 448 457 { … … 454 463 } 455 464 } 456 _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex)); 465 _p_instance->setErrorInfo(IID_IVLCInput, 466 libvlc_exception_get_message(&ex)); 457 467 libvlc_exception_clear(&ex); 458 468 return E_FAIL; … … 470 480 libvlc_exception_init(&ex); 471 481 472 libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 482 libvlc_media_player_t *p_md; 483 p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 473 484 if( ! libvlc_exception_raised(&ex) ) 474 485 { … … 480 491 } 481 492 } 482 _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex)); 493 _p_instance->setErrorInfo(IID_IVLCInput, 494 libvlc_exception_get_message(&ex)); 483 495 libvlc_exception_clear(&ex); 484 496 return E_FAIL; … … 499 511 libvlc_exception_init(&ex); 500 512 501 libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 513 libvlc_media_player_t *p_md; 514 p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 502 515 if( ! libvlc_exception_raised(&ex) ) 503 516 { … … 509 522 } 510 523 } 511 _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex)); 524 _p_instance->setErrorInfo(IID_IVLCInput, 525 libvlc_exception_get_message(&ex)); 512 526 libvlc_exception_clear(&ex); 513 527 return E_FAIL; … … 525 539 libvlc_exception_init(&ex); 526 540 527 libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 541 libvlc_media_player_t *p_md; 542 p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 528 543 if( ! libvlc_exception_raised(&ex) ) 529 544 { … … 535 550 } 536 551 } 537 _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex)); 552 _p_instance->setErrorInfo(IID_IVLCInput, 553 libvlc_exception_get_message(&ex)); 538 554 libvlc_exception_clear(&ex); 539 555 return E_FAIL; … … 554 570 libvlc_exception_init(&ex); 555 571 556 libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 572 libvlc_media_player_t *p_md; 573 p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 557 574 if( ! libvlc_exception_raised(&ex) ) 558 575 { … … 584 601 libvlc_exception_init(&ex); 585 602 586 libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 603 libvlc_media_player_t *p_md; 604 p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 587 605 if( ! libvlc_exception_raised(&ex) ) 588 606 { … … 594 612 } 595 613 } 596 _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex)); 614 _p_instance->setErrorInfo(IID_IVLCInput, 615 libvlc_exception_get_message(&ex)); 597 616 libvlc_exception_clear(&ex); 598 617 return E_FAIL; … … 610 629 libvlc_exception_init(&ex); 611 630 612 libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 631 libvlc_media_player_t *p_md; 632 p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 613 633 if( ! libvlc_exception_raised(&ex) ) 614 634 { … … 620 640 } 621 641 } 622 _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex)); 642 _p_instance->setErrorInfo(IID_IVLCInput, 643 libvlc_exception_get_message(&ex)); 623 644 libvlc_exception_clear(&ex); 624 645 return E_FAIL; … … 640 661 libvlc_exception_init(&ex); 641 662 642 libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 663 libvlc_media_player_t *p_md; 664 p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 643 665 if( ! libvlc_exception_raised(&ex) ) 644 666 { … … 650 672 } 651 673 } 652 _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex)); 674 _p_instance->setErrorInfo(IID_IVLCInput, 675 libvlc_exception_get_message(&ex)); 653 676 libvlc_exception_clear(&ex); 654 677 return E_FAIL; … … 669 692 libvlc_exception_init(&ex); 670 693 671 libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 694 libvlc_media_player_t *p_md; 695 p_md = libvlc_playlist_get_media_player(p_libvlc, &ex); 672 696 if( ! libvlc_exception_raised(&ex) ) 673 697 { 674 *hasVout = libvlc_media_player_has_vout(p_md, &ex) ? VARIANT_TRUE : VARIANT_FALSE; 698 *hasVout = libvlc_media_player_has_vout(p_md, &ex) ? 699 VARIANT_TRUE : VARIANT_FALSE; 675 700 libvlc_media_player_release(p_md); 676 701 if( ! libvlc_exception_raised(&ex) ) … … 679 704 } 680 705 } 681 _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex)); 706 _p_instance->setErrorInfo(IID_IVLCInput, 707 libvlc_exception_get_message(&ex)); 682 708 libvlc_exception_clear(&ex); 683 709 return E_FAIL; … … 800 826 if( libvlc_exception_raised(&ex) ) 801 827 { 802 _p_instance->setErrorInfo(IID_IVLCLog, libvlc_exception_get_message(&ex)); 828 _p_instance->setErrorInfo(IID_IVLCLog, 829 libvlc_exception_get_message(&ex)); 803 830 libvlc_exception_clear(&ex); 804 831 return E_FAIL; … … 831 858 if( libvlc_exception_raised(&ex) ) 832 859 { 833 _p_instance->setErrorInfo(IID_IVLCLog, libvlc_exception_get_message(&ex)); 860 _p_instance->setErrorInfo(IID_IVLCLog, 861 libvlc_exception_get_message(&ex)); 834 862 libvlc_exception_clear(&ex); 835 863 return E_FAIL; … … 839 867 if( libvlc_exception_raised(&ex) ) 840 868 { 841 _p_instance->setErrorInfo(IID_IVLCLog, libvlc_exception_get_message(&ex)); 869 _p_instance->setErrorInfo(IID_IVLCLog, 870 libvlc_exception_get_message(&ex)); 842 871 libvlc_exception_clear(&ex); 843 872 return E_FAIL; … … 851 880 if( libvlc_exception_raised(&ex) ) 852 881 { 853 _p_instance->setErrorInfo(IID_IVLCLog, libvlc_exception_get_message(&ex)); 882 _p_instance->setErrorInfo(IID_IVLCLog, 883 libvlc_exception_get_message(&ex)); 854 884 libvlc_exception_clear(&ex); 855 885 return E_FAIL; … … 920 950 if( msg ) 921 951 { 922 if( SUCCEEDED(msg->QueryInterface(IID_IDispatch, (LPVOID*)&V_DISPATCH(&v))) ) 952 if( SUCCEEDED(msg->QueryInterface(IID_IDispatch, 953 (LPVOID*)&V_DISPATCH(&v))) ) 923 954 { 924 955 V_VT(&v) = VT_DISPATCH; … … 1050 1081 if( libvlc_exception_raised(&ex) ) 1051 1082 { 1052 _p_instance->setErrorInfo(IID_IVLCMessages, libvlc_exception_get_message(&ex)); 1083 _p_instance->setErrorInfo(IID_IVLCMessages, 1084 libvlc_exception_get_message(&ex)); 1053 1085 libvlc_exception_clear(&ex); 1054 1086 return E_FAIL; … … 1072 1104 if( libvlc_exception_raised(&ex) ) 1073 1105 { 1074 _p_instance->setErrorInfo(IID_IVLCMessages, libvlc_exception_get_message(&ex)); 1106 _p_instance->setErrorInfo(IID_IVLCMessages, 1107 libvlc_exception_get_message(&ex)); 1075 1108 libvlc_exception_clear(&ex); 1076 1109 return E_FAIL; … … 1198 1231 libvlc_exception_init(&ex); 1199 1232 1200 *hasNext = libvlc_log_iterator_has_next(_p_iter, &ex) ? VARIANT_TRUE : VARIANT_FALSE; 1233 *hasNext = libvlc_log_iterator_has_next(_p_iter, &ex) ? 1234 VARIANT_TRUE : VARIANT_FALSE; 1201 1235 if( libvlc_exception_raised(&ex) ) 1202 1236 { 1203 _p_instance->setErrorInfo(IID_IVLCMessageIterator, libvlc_exception_get_message(&ex)); 1237 _p_instance->setErrorInfo(IID_IVLCMessageIterator, 1238 libvlc_exception_get_message(&ex)); 1204 1239 libvlc_exception_clear(&ex); 1205 1240 return E_FAIL; … … 1230 1265 if( libvlc_exception_raised(&ex) ) 1231 1266 { 1232 _p_instance->setErrorInfo(IID_IVLCMessageIterator, libvlc_exception_get_message(&ex)); 1267 _p_instance->setErrorInfo(IID_IVLCMessageIterator, 1268 libvlc_exception_get_message(&ex)); 1233 1269 libvlc_exception_clear(&ex); 1234 1270 return E_FAIL; … … 1495 1531 { 1496 1532 _p_instance->setErrorInfo(IID_IVLCPlaylistItems, 1497 libvlc_exception_get_message(&ex));1533 libvlc_exception_get_message(&ex)); 1498 1534 libvlc_exception_clear(&ex); 1499 1535 return E_FAIL; … … 1517 1553 { 1518 1554 _p_instance->setErrorInfo(IID_IVLCPlaylistItems, 1519 libvlc_exception_get_message(&ex));1555 libvlc_exception_get_message(&ex)); 1520 1556 libvlc_exception_clear(&ex); 1521 1557 return E_FAIL; … … 1539 1575 { 1540 1576 _p_instance->setErrorInfo(IID_IVLCPlaylistItems, 1541 libvlc_exception_get_message(&ex));1577 libvlc_exception_get_message(&ex)); 1542 1578 libvlc_exception_clear(&ex); 1543 1579 return E_FAIL; … … 1645 1681 { 1646 1682 _p_instance->setErrorInfo(IID_IVLCPlaylist, 1647 libvlc_exception_get_message(&ex));1683 libvlc_exception_get_message(&ex)); 1648 1684 libvlc_exception_clear(&ex); 1649 1685 return E_FAIL; … … 1666 1702 libvlc_exception_init(&ex); 1667 1703 1668 *isPlaying = libvlc_playlist_isplaying(p_libvlc, &ex) ? VARIANT_TRUE: VARIANT_FALSE; 1704 *isPlaying = libvlc_playlist_isplaying(p_libvlc, &ex) ? 1705 VARIANT_TRUE: VARIANT_FALSE; 1669 1706 if( libvlc_exception_raised(&ex) ) 1670 1707 { 1671 1708 _p_instance->setErrorInfo(IID_IVLCPlaylist, 1672 libvlc_exception_get_message(&ex));1709 libvlc_exception_get_message(&ex)); 1673 1710 libvlc_exception_clear(&ex); 1674 1711 return E_FAIL; … … 2786 2823 return E_POINTER; 2787 2824 2788 const char *versionStr = VLC_Version();2825 const char *versionStr = libvlc_get_version(); 2789 2826 if( NULL != versionStr ) 2790 2827 { 2791 2828 *version = BSTRFromCStr(CP_UTF8, versionStr); 2792 2829 2793 return NULL == *version? E_OUTOFMEMORY : NOERROR;2830 return (NULL == *version) ? E_OUTOFMEMORY : NOERROR; 2794 2831 } 2795 2832 *version = NULL;
