diff options
| author | Sangchul Lee <sc11.lee@samsung.com> | 2013-01-10 22:20:26 +0900 |
|---|---|---|
| committer | Sangchul Lee <sc11.lee@samsung.com> | 2013-01-10 22:20:26 +0900 |
| commit | f2558a8deeaf82902244213eba2d6a62cc2435ee (patch) | |
| tree | 2d03b7c220813b2d6fcc3f722e61a6d70d8ca4e8 | |
| parent | eb74575c2a627edfb8efef1e967fa196af353a67 (diff) | |
| parent | 2cd896103358b5ca3216827f5c9b8bcb1c0e97b3 (diff) | |
| download | libmm-player-f2558a8deeaf82902244213eba2d6a62cc2435ee.tar.gz libmm-player-f2558a8deeaf82902244213eba2d6a62cc2435ee.tar.bz2 libmm-player-f2558a8deeaf82902244213eba2d6a62cc2435ee.zip | |
Merge branch 'master' into tizen_2.0
| -rw-r--r-- | packaging/libmm-player.spec | 2 | ||||
| -rwxr-xr-x | src/mm_player_priv.c | 19 |
2 files changed, 9 insertions, 12 deletions
diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec index ac0220f..89b826f 100644 --- a/packaging/libmm-player.spec +++ b/packaging/libmm-player.spec @@ -1,7 +1,7 @@ Name: libmm-player Summary: Multimedia Framework Player Library -Version: 0.2.7 +Version: 0.2.8 Release: 0 Group: System/Libraries License: Apache License, Version 2.0 diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c index bcae32d..c7926bc 100755 --- a/src/mm_player_priv.c +++ b/src/mm_player_priv.c @@ -5704,7 +5704,7 @@ static gboolean __mmfplayer_parse_profile(const char *uri, void *param, MMPlayer /* dump parse result */ debug_log("profile parsing result ---\n"); - debug_log("incomming uri : %s\n", uri); + debug_warning("incomming uri : %s\n", uri); debug_log("uri : %s\n", data->uri); debug_log("uri_type : %d\n", data->uri_type); debug_log("play_mode : %d\n", data->play_mode); @@ -5789,11 +5789,7 @@ __mmplayer_asm_callback(int handle, ASM_event_sources_t event_src, ASM_sound_com player->sm.by_asm_cb = 1; // it should be enabled for player state transition with called application command player->sm.event_src = event_src; - if(event_src == ASM_EVENT_SOURCE_OTHER_PLAYER_APP) - { - player->sm.event_src = ASM_EVENT_SOURCE_OTHER_APP; - } - else if(event_src == ASM_EVENT_SOURCE_EARJACK_UNPLUG ) + if(event_src == ASM_EVENT_SOURCE_EARJACK_UNPLUG ) { int stop_by_asm = 0; @@ -5853,7 +5849,7 @@ __mmplayer_asm_callback(int handle, ASM_event_sources_t event_src, ASM_sound_com if(event_src == ASM_EVENT_SOURCE_CALL_START || event_src == ASM_EVENT_SOURCE_ALARM_START - || event_src == ASM_EVENT_SOURCE_OTHER_APP) + || event_src == ASM_EVENT_SOURCE_MEDIA) { //hold 0.7 second to excute "fadedown mute" effect debug_log ("do fade down->pause->undo fade down"); @@ -9457,6 +9453,7 @@ __gst_handle_stream_error( mm_player_t* player, GError* error, GstMessage * mess case GST_STREAM_ERROR_DECODE: case GST_STREAM_ERROR_WRONG_TYPE: case GST_STREAM_ERROR_DECRYPT: + case GST_STREAM_ERROR_DECRYPT_NOKEY: trans_err = __gst_transform_gsterror( player, message, error ); break; @@ -9467,7 +9464,6 @@ __gst_handle_stream_error( mm_player_t* player, GError* error, GstMessage * mess case GST_STREAM_ERROR_DEMUX: case GST_STREAM_ERROR_MUX: case GST_STREAM_ERROR_FORMAT: - case GST_STREAM_ERROR_DECRYPT_NOKEY: default: trans_err = MM_ERROR_PLAYER_INVALID_STREAM; break; @@ -9595,7 +9591,7 @@ __gst_transform_gsterror( mm_player_t* player, GstMessage * message, GError* err } } } - return MM_ERROR_PLAYER_INVALID_STREAM; + return MM_ERROR_PLAYER_INVALID_STREAM; } break; @@ -9606,8 +9602,9 @@ __gst_transform_gsterror( mm_player_t* player, GstMessage * message, GError* err break; case GST_STREAM_ERROR_DECRYPT: - { - debug_log("%s failed reason : %s\n", src_element_name, error->message); + case GST_STREAM_ERROR_DECRYPT_NOKEY: + { + debug_error("decryption error, %s failed reason : %s\n", src_element_name, error->message); return MM_MESSAGE_DRM_NOT_AUTHORIZED; } break; |